diff --git a/app/src/main/java/org/fdroid/fdroid/RepoUpdater.java b/app/src/main/java/org/fdroid/fdroid/RepoUpdater.java
index ac226b0db..4dc986e05 100644
--- a/app/src/main/java/org/fdroid/fdroid/RepoUpdater.java
+++ b/app/src/main/java/org/fdroid/fdroid/RepoUpdater.java
@@ -359,7 +359,7 @@ public class RepoUpdater {
         if (repo.signingCertificate.equals(certFromJar)
                 && repo.signingCertificate.equals(certFromIndexXml)
                 && certFromIndexXml.equals(certFromJar)) {
-            return;  // we have a match!
+            return; // we have a match!
         }
         throw new SigningException(repo, "Signing certificate does not match!");
     }
diff --git a/app/src/main/java/org/fdroid/fdroid/Utils.java b/app/src/main/java/org/fdroid/fdroid/Utils.java
index 3b58681dc..2455d5ff4 100644
--- a/app/src/main/java/org/fdroid/fdroid/Utils.java
+++ b/app/src/main/java/org/fdroid/fdroid/Utils.java
@@ -275,7 +275,7 @@ public final class Utils {
     // return a fingerprint formatted for display
     public static String formatFingerprint(Context context, String fingerprint) {
         if (TextUtils.isEmpty(fingerprint)
-                || fingerprint.length() != 64  // SHA-256 is 64 hex chars
+                || fingerprint.length() != 64 // SHA-256 is 64 hex chars
                 || fingerprint.matches(".*[^0-9a-fA-F].*")) { // its a hex string
             return context.getString(R.string.bad_fingerprint);
         }
diff --git a/app/src/main/java/org/fdroid/fdroid/net/WifiStateChangeService.java b/app/src/main/java/org/fdroid/fdroid/net/WifiStateChangeService.java
index 3dd1e134b..7b13d1683 100644
--- a/app/src/main/java/org/fdroid/fdroid/net/WifiStateChangeService.java
+++ b/app/src/main/java/org/fdroid/fdroid/net/WifiStateChangeService.java
@@ -55,7 +55,7 @@ public class WifiStateChangeService extends Service {
                NetworkInfo is only passed via WifiStateChangeReceiver */
             Utils.debugLog(TAG, "ni == " + ni + "  wifiState == " + printWifiState(wifiState));
             if (wifiState == WifiManager.WIFI_STATE_ENABLED
-                    || wifiState == WifiManager.WIFI_STATE_DISABLING   // might be switching to hotspot
+                    || wifiState == WifiManager.WIFI_STATE_DISABLING  // might be switching to hotspot
                     || wifiState == WifiManager.WIFI_STATE_DISABLED   // might be hotspot
                     || wifiState == WifiManager.WIFI_STATE_UNKNOWN) { // might be hotspot
                 if (asyncTask != null) {
@@ -100,7 +100,7 @@ public class WifiStateChangeService extends Service {
                         if (FDroidApp.ipAddressString == null) {
                             return null;
                         }
-                    } else {  // a hotspot can be active during WIFI_STATE_UNKNOWN
+                    } else { // a hotspot can be active during WIFI_STATE_UNKNOWN
                         setIpInfoFromNetworkInterface();
                     }
 
diff --git a/app/src/main/java/org/fdroid/fdroid/views/AvailableAppListAdapter.java b/app/src/main/java/org/fdroid/fdroid/views/AvailableAppListAdapter.java
index 74ccc2a7e..e39f67ee1 100644
--- a/app/src/main/java/org/fdroid/fdroid/views/AvailableAppListAdapter.java
+++ b/app/src/main/java/org/fdroid/fdroid/views/AvailableAppListAdapter.java
@@ -6,7 +6,7 @@ import android.os.Build;
 
 public class AvailableAppListAdapter extends AppListAdapter {
 
-    public static AvailableAppListAdapter create(Context context, Cursor cursor, int flags)   {
+    public static AvailableAppListAdapter create(Context context, Cursor cursor, int flags) {
         if (Build.VERSION.SDK_INT >= 11) {
             return new AvailableAppListAdapter(context, cursor, flags);
         }
diff --git a/app/src/main/java/org/fdroid/fdroid/views/InstalledAppListAdapter.java b/app/src/main/java/org/fdroid/fdroid/views/InstalledAppListAdapter.java
index 4aaef1b8e..4c97ecc9e 100644
--- a/app/src/main/java/org/fdroid/fdroid/views/InstalledAppListAdapter.java
+++ b/app/src/main/java/org/fdroid/fdroid/views/InstalledAppListAdapter.java
@@ -6,7 +6,7 @@ import android.os.Build;
 
 public class InstalledAppListAdapter extends AppListAdapter {
 
-    public static InstalledAppListAdapter create(Context context, Cursor cursor, int flags)  {
+    public static InstalledAppListAdapter create(Context context, Cursor cursor, int flags) {
         if (Build.VERSION.SDK_INT >= 11) {
             return new InstalledAppListAdapter(context, cursor, flags);
         }
diff --git a/app/src/main/java/org/fdroid/fdroid/views/RepoAdapter.java b/app/src/main/java/org/fdroid/fdroid/views/RepoAdapter.java
index 08d071c70..fbb139c01 100644
--- a/app/src/main/java/org/fdroid/fdroid/views/RepoAdapter.java
+++ b/app/src/main/java/org/fdroid/fdroid/views/RepoAdapter.java
@@ -23,7 +23,7 @@ public class RepoAdapter extends CursorAdapter {
 
     private EnabledListener enabledListener;
 
-    public static RepoAdapter create(Context context, Cursor cursor, int flags)   {
+    public static RepoAdapter create(Context context, Cursor cursor, int flags) {
         if (Build.VERSION.SDK_INT >= 11) {
             return new RepoAdapter(context, cursor, flags);
         }