diff --git a/app/src/main/java/com/github/javiersantos/piracychecker/demo/MainActivity.java b/app/src/main/java/com/github/javiersantos/piracychecker/demo/MainActivity.java
index d4c5a61..b0e6df6 100644
--- a/app/src/main/java/com/github/javiersantos/piracychecker/demo/MainActivity.java
+++ b/app/src/main/java/com/github/javiersantos/piracychecker/demo/MainActivity.java
@@ -14,7 +14,6 @@
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
-import android.widget.RadioButton;
 import android.widget.RadioGroup;
 
 import com.github.javiersantos.piracychecker.PiracyChecker;
diff --git a/library/src/main/java/com/github/javiersantos/licensing/APKExpansionPolicy.java b/library/src/main/java/com/github/javiersantos/licensing/APKExpansionPolicy.java
index 751cfe5..5501d35 100644
--- a/library/src/main/java/com/github/javiersantos/licensing/APKExpansionPolicy.java
+++ b/library/src/main/java/com/github/javiersantos/licensing/APKExpansionPolicy.java
@@ -16,12 +16,12 @@
  * limitations under the License.
  */
 
-import com.github.javiersantos.licensing.util.URIQueryDecoder;
-
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.util.Log;
 
+import com.github.javiersantos.licensing.util.URIQueryDecoder;
+
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.HashMap;
diff --git a/library/src/main/java/com/github/javiersantos/licensing/LibraryChecker.java b/library/src/main/java/com/github/javiersantos/licensing/LibraryChecker.java
index 23dfa7f..656446d 100644
--- a/library/src/main/java/com/github/javiersantos/licensing/LibraryChecker.java
+++ b/library/src/main/java/com/github/javiersantos/licensing/LibraryChecker.java
@@ -16,9 +16,6 @@
 
 package com.github.javiersantos.licensing;
 
-import com.github.javiersantos.licensing.util.Base64;
-import com.github.javiersantos.licensing.util.Base64DecoderException;
-
 import android.annotation.SuppressLint;
 import android.content.ComponentName;
 import android.content.Context;
@@ -34,6 +31,8 @@
 
 import com.android.vending.licensing.ILicenseResultListener;
 import com.android.vending.licensing.ILicensingService;
+import com.github.javiersantos.licensing.util.Base64;
+import com.github.javiersantos.licensing.util.Base64DecoderException;
 
 import java.security.KeyFactory;
 import java.security.NoSuchAlgorithmException;
diff --git a/library/src/main/java/com/github/javiersantos/licensing/LibraryValidator.java b/library/src/main/java/com/github/javiersantos/licensing/LibraryValidator.java
index 49242ae..9baf243 100644
--- a/library/src/main/java/com/github/javiersantos/licensing/LibraryValidator.java
+++ b/library/src/main/java/com/github/javiersantos/licensing/LibraryValidator.java
@@ -16,12 +16,12 @@
 
 package com.github.javiersantos.licensing;
 
-import com.github.javiersantos.licensing.util.Base64;
-import com.github.javiersantos.licensing.util.Base64DecoderException;
-
 import android.text.TextUtils;
 import android.util.Log;
 
+import com.github.javiersantos.licensing.util.Base64;
+import com.github.javiersantos.licensing.util.Base64DecoderException;
+
 import java.security.InvalidKeyException;
 import java.security.NoSuchAlgorithmException;
 import java.security.PublicKey;
diff --git a/library/src/main/java/com/github/javiersantos/licensing/ServerManagedPolicy.java b/library/src/main/java/com/github/javiersantos/licensing/ServerManagedPolicy.java
index 2c8dd39..e352de5 100644
--- a/library/src/main/java/com/github/javiersantos/licensing/ServerManagedPolicy.java
+++ b/library/src/main/java/com/github/javiersantos/licensing/ServerManagedPolicy.java
@@ -16,12 +16,12 @@
 
 package com.github.javiersantos.licensing;
 
-import com.github.javiersantos.licensing.util.URIQueryDecoder;
-
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.util.Log;
 
+import com.github.javiersantos.licensing.util.URIQueryDecoder;
+
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.HashMap;
diff --git a/library/src/main/java/com/github/javiersantos/piracychecker/LibraryUtils.java b/library/src/main/java/com/github/javiersantos/piracychecker/LibraryUtils.java
index bda707d..0768dd9 100644
--- a/library/src/main/java/com/github/javiersantos/piracychecker/LibraryUtils.java
+++ b/library/src/main/java/com/github/javiersantos/piracychecker/LibraryUtils.java
@@ -5,13 +5,11 @@
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
-import android.content.SharedPreferences;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.Signature;
 import android.os.Environment;
-import android.support.annotation.NonNull;
 import android.support.v7.app.AlertDialog;
 import android.util.Base64;