diff --git a/F-Droid/src/org/fdroid/fdroid/data/RepoPersister.java b/F-Droid/src/org/fdroid/fdroid/data/RepoPersister.java
index a1e174f29..d50f4fa5d 100644
--- a/F-Droid/src/org/fdroid/fdroid/data/RepoPersister.java
+++ b/F-Droid/src/org/fdroid/fdroid/data/RepoPersister.java
@@ -268,12 +268,11 @@ public class RepoPersister {
             }
         }
 
-        if (toDelete.size() > 0) {
-            Uri uri = TempApkProvider.getApksUri(repo, toDelete);
-            return ContentProviderOperation.newDelete(uri).build();
-        } else {
+        if (toDelete.size() == 0) {
             return null;
         }
+        Uri uri = TempApkProvider.getApksUri(repo, toDelete);
+        return ContentProviderOperation.newDelete(uri).build();
     }
 
     /**
diff --git a/F-Droid/src/org/fdroid/fdroid/net/DownloaderFactory.java b/F-Droid/src/org/fdroid/fdroid/net/DownloaderFactory.java
index 4edc5e6b6..eb7fba3b3 100644
--- a/F-Droid/src/org/fdroid/fdroid/net/DownloaderFactory.java
+++ b/F-Droid/src/org/fdroid/fdroid/net/DownloaderFactory.java
@@ -53,9 +53,11 @@ public class DownloaderFactory {
         if (isBluetoothAddress(url)) {
             String macAddress = url.getHost().replace("-", ":");
             return new BluetoothDownloader(context, macAddress, url, destFile);
-        } else if (isOnionAddress(url)) {
+        }
+        if (isOnionAddress(url)) {
             return new TorHttpDownloader(context, url, destFile);
-        } else if (isLocalFile(url)) {
+        }
+        if (isLocalFile(url)) {
             return new LocalFileDownloader(context, url, destFile);
         }
         return new HttpDownloader(context, url, destFile, username, password);
diff --git a/F-Droid/src/org/fdroid/fdroid/net/bluetooth/BluetoothServer.java b/F-Droid/src/org/fdroid/fdroid/net/bluetooth/BluetoothServer.java
index d676a19c7..61de28a37 100644
--- a/F-Droid/src/org/fdroid/fdroid/net/bluetooth/BluetoothServer.java
+++ b/F-Droid/src/org/fdroid/fdroid/net/bluetooth/BluetoothServer.java
@@ -328,14 +328,12 @@ public class BluetoothServer extends Thread {
 
         // Announce that the file server accepts partial content requests
         private Response createResponse(NanoHTTPD.Response.Status status, String mimeType, String content) {
-            Response res = new Response(status.getRequestStatus(), mimeType, content);
-            return res;
+            return new Response(status.getRequestStatus(), mimeType, content);
         }
 
         // Announce that the file server accepts partial content requests
         private Response createResponse(NanoHTTPD.Response.Status status, String mimeType, InputStream content) {
-            Response res = new Response(status.getRequestStatus(), mimeType, content);
-            return res;
+            return new Response(status.getRequestStatus(), mimeType, content);
         }
 
         public static String getMimeTypeForFile(String uri) {