diff --git a/lib/src/main/java/com/soundcloud/android/crop/CropImageView.java b/lib/src/main/java/com/soundcloud/android/crop/CropImageView.java
index c977d59..c9ff98b 100644
--- a/lib/src/main/java/com/soundcloud/android/crop/CropImageView.java
+++ b/lib/src/main/java/com/soundcloud/android/crop/CropImageView.java
@@ -3,6 +3,7 @@ package com.soundcloud.android.crop;
 import android.content.Context;
 import android.graphics.Canvas;
 import android.graphics.Rect;
+import android.support.annotation.NonNull;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
 
@@ -18,17 +19,14 @@ public class CropImageView extends ImageViewTouchBase {
     private float lastY;
     private int motionEdge;
 
-    @SuppressWarnings("UnusedDeclaration")
     public CropImageView(Context context) {
         super(context);
     }
 
-    @SuppressWarnings("UnusedDeclaration")
     public CropImageView(Context context, AttributeSet attrs) {
         super(context, attrs);
     }
 
-    @SuppressWarnings("UnusedDeclaration")
     public CropImageView(Context context, AttributeSet attrs, int defStyle) {
         super(context, attrs, defStyle);
     }
@@ -189,7 +187,7 @@ public class CropImageView extends ImageViewTouchBase {
     }
 
     @Override
-    protected void onDraw(Canvas canvas) {
+    protected void onDraw(@NonNull Canvas canvas) {
         super.onDraw(canvas);
         for (HighlightView mHighlightView : highlightViews) {
             mHighlightView.draw(canvas);
diff --git a/lib/src/main/java/com/soundcloud/android/crop/Log.java b/lib/src/main/java/com/soundcloud/android/crop/Log.java
index 492922d..e5be72c 100644
--- a/lib/src/main/java/com/soundcloud/android/crop/Log.java
+++ b/lib/src/main/java/com/soundcloud/android/crop/Log.java
@@ -4,11 +4,11 @@ class Log {
 
     private static final String TAG = "android-crop";
 
-    public static final void e(String msg) {
+    public static void e(String msg) {
         android.util.Log.e(TAG, msg);
     }
 
-    public static final void e(String msg, Throwable e) {
+    public static void e(String msg, Throwable e) {
         android.util.Log.e(TAG, msg, e);
     }
 
diff --git a/lib/src/main/res/values-es/strings.xml b/lib/src/main/res/values-es/strings.xml
index 5a116f4..e6792bd 100644
--- a/lib/src/main/res/values-es/strings.xml
+++ b/lib/src/main/res/values-es/strings.xml
@@ -2,7 +2,7 @@
 
     <string name="crop__saving">Guardando imagen…</string>
     <string name="crop__wait">Por favor espere…</string>
-    <string name="crop__pick_error">No hay imagenes disponibles</string>
+    <string name="crop__pick_error">No hay imágenes disponibles</string>
 
     <string name="crop__done">ACEPTAR</string>
     <string name="crop__cancel" tools:ignore="ButtonCase">CANCELAR</string>
diff --git a/lib/src/main/res/values-ko/strings.xml b/lib/src/main/res/values-ko/strings.xml
index c4844c4..b7e7317 100644
--- a/lib/src/main/res/values-ko/strings.xml
+++ b/lib/src/main/res/values-ko/strings.xml
@@ -1,10 +1,10 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
 
-    <string name="crop__saving">사진을 저장중입니다...</string>
-    <string name="crop__wait">잠시만 기다려주세요...</string>
+    <string name="crop__saving">사진을 저장중입니다…</string>
+    <string name="crop__wait">잠시만 기다려주세요…</string>
     <string name="crop__pick_error">이미지가 존재하지 않습니다.</string>
 
     <string name="crop__done">확인</string>
     <string name="crop__cancel" tools:ignore="ButtonCase">취소</string>
 
-</resources>
\ No newline at end of file
+</resources>
diff --git a/lib/src/main/res/values-zh/strings.xml b/lib/src/main/res/values-zh/strings.xml
index 3a14a69..2290bc3 100644
--- a/lib/src/main/res/values-zh/strings.xml
+++ b/lib/src/main/res/values-zh/strings.xml
@@ -3,7 +3,8 @@
     <string name="crop__saving">正在保存照片…</string>
     <string name="crop__wait">请等待…</string>
     <string name="crop__pick_error">无效的图片</string>
+
     <string name="crop__done">完成</string>
     <string name="crop__cancel" tools:ignore="ButtonCase">取消</string>
 
-</resources>
\ No newline at end of file
+</resources>