diff --git a/app/src/main/java/fr/free/nrw/commons/LicenseList.java b/app/src/main/java/fr/free/nrw/commons/LicenseList.java
index 0ef067496..f3edf3be0 100644
--- a/app/src/main/java/fr/free/nrw/commons/LicenseList.java
+++ b/app/src/main/java/fr/free/nrw/commons/LicenseList.java
@@ -69,9 +69,8 @@ public class LicenseList {
         int nameId = stringIdByName(stringId);
         //Log.d("Commons", "LicenseList.nameForTemplate: nameId: " + nameId);
         if(nameId != 0) {
-            String name = res.getString(nameId);
             //Log.d("Commons", "LicenseList.nameForTemplate: name: " + name);
-            return name;
+            return res.getString(nameId);
         }
         return template;
     }
diff --git a/app/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java b/app/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java
index 0f71e329b..2d7b77024 100644
--- a/app/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java
+++ b/app/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java
@@ -357,8 +357,7 @@ public class CategorizationFragment extends Fragment {
                     new String[] {name},
                     null);
             if (cursor.moveToFirst()) {
-                Category cat = Category.fromCursor(cursor);
-                return cat;
+                return Category.fromCursor(cursor);
             }
         } catch (RemoteException e) {
             // This feels lazy, but to hell with checked exceptions. :)
diff --git a/app/src/main/java/fr/free/nrw/commons/category/MethodAUpdater.java b/app/src/main/java/fr/free/nrw/commons/category/MethodAUpdater.java
index 35ab0ef17..33835119e 100644
--- a/app/src/main/java/fr/free/nrw/commons/category/MethodAUpdater.java
+++ b/app/src/main/java/fr/free/nrw/commons/category/MethodAUpdater.java
@@ -108,7 +108,6 @@ public class MethodAUpdater extends AsyncTask<Void, Void, ArrayList<String>> {
         }
 
         Timber.d("Found categories from Method A search, waiting for filter");
-        ArrayList<String> filteredItems = new ArrayList<>(filterYears(categories));
-        return filteredItems;
+        return new ArrayList<>(filterYears(categories));
     }
 }
diff --git a/app/src/main/java/fr/free/nrw/commons/category/PrefixUpdater.java b/app/src/main/java/fr/free/nrw/commons/category/PrefixUpdater.java
index 10499acbd..350c0b21f 100644
--- a/app/src/main/java/fr/free/nrw/commons/category/PrefixUpdater.java
+++ b/app/src/main/java/fr/free/nrw/commons/category/PrefixUpdater.java
@@ -83,16 +83,14 @@ public class PrefixUpdater extends AsyncTask<Void, Void, ArrayList<String>> {
         if(TextUtils.isEmpty(filter)) {
             ArrayList<String> mergedItems = new ArrayList<>(catFragment.mergeItems());
             Timber.d("Merged items, waiting for filter");
-            ArrayList<String> filteredItems = new ArrayList<>(filterYears(mergedItems));
-            return filteredItems;
+            return new ArrayList<>(filterYears(mergedItems));
         }
 
         //if user types in something that is in cache, return cached category
         if(catFragment.categoriesCache.containsKey(filter)) {
             ArrayList<String> cachedItems = new ArrayList<>(catFragment.categoriesCache.get(filter));
             Timber.d("Found cache items, waiting for filter");
-            ArrayList<String> filteredItems = new ArrayList<>(filterYears(cachedItems));
-            return filteredItems;
+            return new ArrayList<>(filterYears(cachedItems));
         }
 
         //otherwise if user has typed something in that isn't in cache, search API for matching categories
@@ -119,7 +117,6 @@ public class PrefixUpdater extends AsyncTask<Void, Void, ArrayList<String>> {
         }
 
         Timber.d("Found categories from Prefix search, waiting for filter");
-        ArrayList<String> filteredItems = new ArrayList<>(filterYears(categories));
-        return filteredItems;
+        return new ArrayList<>(filterYears(categories));
     }
 }