diff --git a/F-Droid/src/org/fdroid/fdroid/Hasher.java b/F-Droid/src/org/fdroid/fdroid/Hasher.java
index 51164acc7..2ce6f18fd 100644
--- a/F-Droid/src/org/fdroid/fdroid/Hasher.java
+++ b/F-Droid/src/org/fdroid/fdroid/Hasher.java
@@ -107,7 +107,7 @@ public class Hasher {
         return hex(encoded);
     }
 
-    public static String hex(byte[] sig) {
+    private static String hex(byte[] sig) {
         byte[] csig = new byte[sig.length * 2];
         for (int j = 0; j < sig.length; j++) {
             byte v = sig[j];
diff --git a/F-Droid/src/org/fdroid/fdroid/data/App.java b/F-Droid/src/org/fdroid/fdroid/data/App.java
index 935fab2cf..39b86cda4 100644
--- a/F-Droid/src/org/fdroid/fdroid/data/App.java
+++ b/F-Droid/src/org/fdroid/fdroid/data/App.java
@@ -102,9 +102,6 @@ public class App extends ValueObject implements Comparable<App> {
 
     public String installedSig;
 
-    public boolean system;
-    public boolean updatedSystemApp;
-
     public boolean uninstallable;
 
     @Override
@@ -345,9 +342,9 @@ public class App extends ValueObject implements Comparable<App> {
         apk.sig = Utils.hashBytes(fdroidSig, "md5");
 
         this.installedApk = apk;
-        this.system = (appInfo.flags & ApplicationInfo.FLAG_SYSTEM) != 0;
-        this.updatedSystemApp = (appInfo.flags & ApplicationInfo.FLAG_UPDATED_SYSTEM_APP) != 0;
-        this.uninstallable = !this.system || this.updatedSystemApp;
+        boolean system = (appInfo.flags & ApplicationInfo.FLAG_SYSTEM) != 0;
+        boolean updatedSystemApp = (appInfo.flags & ApplicationInfo.FLAG_UPDATED_SYSTEM_APP) != 0;
+        this.uninstallable = !system || updatedSystemApp;
     }
 
     public boolean isValid() {
diff --git a/F-Droid/src/org/fdroid/fdroid/data/DBHelper.java b/F-Droid/src/org/fdroid/fdroid/data/DBHelper.java
index 1cbc149ed..5afead5e0 100644
--- a/F-Droid/src/org/fdroid/fdroid/data/DBHelper.java
+++ b/F-Droid/src/org/fdroid/fdroid/data/DBHelper.java
@@ -17,7 +17,7 @@ public class DBHelper extends SQLiteOpenHelper {
 
     private static final String TAG = "DBHelper";
 
-    public static final String DATABASE_NAME = "fdroid";
+    private static final String DATABASE_NAME = "fdroid";
 
     public static final String TABLE_REPO = "fdroid_repo";
 
diff --git a/F-Droid/src/org/fdroid/fdroid/privileged/views/AppDiff.java b/F-Droid/src/org/fdroid/fdroid/privileged/views/AppDiff.java
index a227763e7..1e5f1f687 100644
--- a/F-Droid/src/org/fdroid/fdroid/privileged/views/AppDiff.java
+++ b/F-Droid/src/org/fdroid/fdroid/privileged/views/AppDiff.java
@@ -25,7 +25,7 @@ import android.net.Uri;
 
 public class AppDiff {
 
-    public final PackageManager mPm;
+    private final PackageManager mPm;
     public final PackageInfo mPkgInfo;
 
     public ApplicationInfo mInstalledAppInfo;