diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
index aa14ac519..8e8f7e159 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
@@ -80,7 +80,7 @@ public class ImportKeysActivity extends BaseActivity implements ImportKeysListen
     public static final String TAG_FRAG_TOP = "frag_top";
 
     private boolean mFreshIntent;
-    private CryptoOperationHelper<ImportKeyringParcel, ImportKeyResult> mOperationHelper;
+    private CryptoOperationHelper<ImportKeyringParcel, ImportKeyResult> mOpHelper;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -308,8 +308,8 @@ public class ImportKeysActivity extends BaseActivity implements ImportKeysListen
 
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
-        if (mOperationHelper != null &&
-                mOperationHelper.handleActivityResult(requestCode, resultCode, data)) {
+        if (mOpHelper != null &&
+                mOpHelper.handleActivityResult(requestCode, resultCode, data)) {
             return;
         }
         super.onActivityResult(requestCode, resultCode, data);
@@ -355,8 +355,8 @@ public class ImportKeysActivity extends BaseActivity implements ImportKeysListen
 
         ImportKeyringParcel inputParcel = new ImportKeyringParcel(null, null);
         ImportKeysOperationCallback callback = new ImportKeysOperationCallback(this, inputParcel);
-        mOperationHelper = new CryptoOperationHelper(1, this, callback, R.string.progress_importing);
-        mOperationHelper.cryptoOperation();
+        mOpHelper = new CryptoOperationHelper<>(1, this, callback, R.string.progress_importing);
+        mOpHelper.cryptoOperation();
     }
 
     @Override
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java
index c2e9b814b..17c52f9bf 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java
@@ -156,7 +156,7 @@ public class ImportKeysAdapter extends RecyclerView.Adapter<ImportKeysAdapter.Vi
 
         b.extra.showKey.setOnClickListener(new OnClickListener() {
             @Override
-            public void onClick(View view) {
+            public void onClick(View v) {
                 Intent intent = new Intent(mActivity, ViewKeyActivity.class);
                 intent.setData(KeyRings.buildGenericKeyRingUri(entry.getKeyId()));
                 mActivity.startActivity(intent);
@@ -176,7 +176,7 @@ public class ImportKeysAdapter extends RecyclerView.Adapter<ImportKeysAdapter.Vi
         ImportKeysResultListener listener = skipSave ? this : mListener;
         ImportKeysOperationCallback cb = new ImportKeysOperationCallback(listener, inputParcel);
         int message = skipSave ? R.string.progress_downloading : R.string.progress_importing;
-        CryptoOperationHelper opHelper = new CryptoOperationHelper(1, mActivity, cb, message);
+        CryptoOperationHelper opHelper = new CryptoOperationHelper<>(1, mActivity, cb, message);
         opHelper.cryptoOperation();
     }
 
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/PermissionsUtil.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/PermissionsUtil.java
index 14086c087..e39e73147 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/PermissionsUtil.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/PermissionsUtil.java
@@ -11,9 +11,7 @@ import android.widget.Toast;
 
 import org.sufficientlysecure.keychain.R;
 
-/**
- * Created by Andrea on 19/06/2016.
- */
+
 public class PermissionsUtil {
 
     private static final int PERMISSION_READ_EXTERNAL_STORAGE = 1;