diff --git a/F-Droid/src/org/fdroid/fdroid/AppDetails.java b/F-Droid/src/org/fdroid/fdroid/AppDetails.java
index 8bdd389f9..9483c00d8 100644
--- a/F-Droid/src/org/fdroid/fdroid/AppDetails.java
+++ b/F-Droid/src/org/fdroid/fdroid/AppDetails.java
@@ -147,17 +147,17 @@ public class AppDetails extends AppCompatActivity implements ProgressListener, A
 
     class AppObserver extends ContentObserver {
 
-        public AppObserver(Handler handler) {
+        AppObserver(Handler handler) {
             super(handler);
         }
 
         @Override
-        public void onChange(boolean selfChange) {
+        void onChange(boolean selfChange) {
             onChange(selfChange, null);
         }
 
         @Override
-        public void onChange(boolean selfChange, Uri uri) {
+        void onChange(boolean selfChange, Uri uri) {
             onAppChanged();
         }
 
@@ -168,7 +168,7 @@ public class AppDetails extends AppCompatActivity implements ProgressListener, A
         private final LayoutInflater mInflater = (LayoutInflater) mctx.getSystemService(
                 Context.LAYOUT_INFLATER_SERVICE);
 
-        public ApkListAdapter(Context context, App app) {
+        ApkListAdapter(Context context, App app) {
             super(context, 0);
             final List<Apk> apks = ApkProvider.Helper.findByApp(context, app.id);
             for (final Apk apk : apks) {
@@ -344,7 +344,7 @@ public class AppDetails extends AppCompatActivity implements ProgressListener, A
         public final ApkDownloader downloader;
         public final App app;
 
-        public ConfigurationChangeHelper(ApkDownloader downloader, App app) {
+        ConfigurationChangeHelper(ApkDownloader downloader, App app) {
             this.downloader = downloader;
             this.app = app;
         }
diff --git a/F-Droid/src/org/fdroid/fdroid/FDroid.java b/F-Droid/src/org/fdroid/fdroid/FDroid.java
index b904f5afe..0be1356db 100644
--- a/F-Droid/src/org/fdroid/fdroid/FDroid.java
+++ b/F-Droid/src/org/fdroid/fdroid/FDroid.java
@@ -365,7 +365,7 @@ public class FDroid extends ActionBarActivity {
 
     private class AppObserver extends ContentObserver {
 
-        public AppObserver() {
+        AppObserver() {
             super(null);
         }
 
diff --git a/F-Droid/src/org/fdroid/fdroid/compat/PRNGFixes.java b/F-Droid/src/org/fdroid/fdroid/compat/PRNGFixes.java
index f1495dc73..3083c18fc 100644
--- a/F-Droid/src/org/fdroid/fdroid/compat/PRNGFixes.java
+++ b/F-Droid/src/org/fdroid/fdroid/compat/PRNGFixes.java
@@ -146,7 +146,7 @@ public final class PRNGFixes extends Compatibility {
     @SuppressWarnings("serial")
     private static class LinuxPRNGSecureRandomProvider extends Provider {
 
-        public LinuxPRNGSecureRandomProvider() {
+        LinuxPRNGSecureRandomProvider() {
             super("LinuxPRNG",
                     1.0,
                     "A Linux-specific random number provider that uses"
diff --git a/F-Droid/src/org/fdroid/fdroid/data/AppProvider.java b/F-Droid/src/org/fdroid/fdroid/data/AppProvider.java
index 1033e799f..01e6d49c6 100644
--- a/F-Droid/src/org/fdroid/fdroid/data/AppProvider.java
+++ b/F-Droid/src/org/fdroid/fdroid/data/AppProvider.java
@@ -241,21 +241,21 @@ public class AppProvider extends FDroidProvider {
 
         private boolean naturalJoinToInstalled;
 
-        public AppQuerySelection() {
+        AppQuerySelection() {
             // The same as no selection, because "1" will always resolve to true when executing the SQL query.
             // e.g. "WHERE 1 AND ..." is the same as "WHERE ..."
             super("1");
         }
 
-        public AppQuerySelection(String selection) {
+        AppQuerySelection(String selection) {
             super(selection);
         }
 
-        public AppQuerySelection(String selection, String[] args) {
+        AppQuerySelection(String selection, String[] args) {
             super(selection, args);
         }
 
-        public AppQuerySelection(String selection, List<String> args) {
+        AppQuerySelection(String selection, List<String> args) {
             super(selection, args);
         }
 
diff --git a/F-Droid/src/org/fdroid/fdroid/data/Repo.java b/F-Droid/src/org/fdroid/fdroid/data/Repo.java
index 34680c772..ff4fa6711 100644
--- a/F-Droid/src/org/fdroid/fdroid/data/Repo.java
+++ b/F-Droid/src/org/fdroid/fdroid/data/Repo.java
@@ -124,6 +124,7 @@ public class Repo extends ValueObject {
     public boolean hasBeenUpdated() {
         return this.lastetag != null;
     }
+
     /**
      * If we haven't run an update for this repo yet, then the name
      * will be unknown, in which case we will just take a guess at an
diff --git a/F-Droid/src/org/fdroid/fdroid/localrepo/type/BluetoothSwap.java b/F-Droid/src/org/fdroid/fdroid/localrepo/type/BluetoothSwap.java
index f411435a2..40e594f4a 100644
--- a/F-Droid/src/org/fdroid/fdroid/localrepo/type/BluetoothSwap.java
+++ b/F-Droid/src/org/fdroid/fdroid/localrepo/type/BluetoothSwap.java
@@ -164,7 +164,7 @@ public final class BluetoothSwap extends SwapType {
 
     private static class NoBluetoothType extends SwapType {
 
-        public NoBluetoothType(@NonNull Context context) {
+        NoBluetoothType(@NonNull Context context) {
             super(context);
         }
 
diff --git a/F-Droid/src/org/fdroid/fdroid/net/AsyncDownloadWrapper.java b/F-Droid/src/org/fdroid/fdroid/net/AsyncDownloadWrapper.java
index 82a830cb7..84618bb7f 100644
--- a/F-Droid/src/org/fdroid/fdroid/net/AsyncDownloadWrapper.java
+++ b/F-Droid/src/org/fdroid/fdroid/net/AsyncDownloadWrapper.java
@@ -28,7 +28,7 @@ class AsyncDownloadWrapper extends Handler implements AsyncDownloader {
      * world about completion. Therefore, we require the listener as a
      * parameter to the constructor.
      */
-    public AsyncDownloadWrapper(Downloader downloader, Listener listener) {
+    AsyncDownloadWrapper(Downloader downloader, Listener listener) {
         this.downloader = downloader;
         this.listener = listener;
     }
diff --git a/F-Droid/src/org/fdroid/fdroid/net/Downloader.java b/F-Droid/src/org/fdroid/fdroid/net/Downloader.java
index 83c20bd1f..201697b97 100644
--- a/F-Droid/src/org/fdroid/fdroid/net/Downloader.java
+++ b/F-Droid/src/org/fdroid/fdroid/net/Downloader.java
@@ -213,7 +213,7 @@ public abstract class Downloader {
 
         private final InputStream toWrap;
 
-        public WrappedInputStream(InputStream toWrap) {
+        WrappedInputStream(InputStream toWrap) {
             super();
             this.toWrap = toWrap;
         }
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 69213fdb8..a6138150e 100644
--- a/F-Droid/src/org/fdroid/fdroid/net/bluetooth/BluetoothServer.java
+++ b/F-Droid/src/org/fdroid/fdroid/net/bluetooth/BluetoothServer.java
@@ -105,7 +105,7 @@ public class BluetoothServer extends Thread {
         private final BluetoothSocket socket;
         private final File webRoot;
 
-        public ClientConnection(BluetoothSocket socket, File webRoot) {
+        ClientConnection(BluetoothSocket socket, File webRoot) {
             this.socket = socket;
             this.webRoot = webRoot;
         }
diff --git a/F-Droid/src/org/fdroid/fdroid/privileged/install/InstallExtension.java b/F-Droid/src/org/fdroid/fdroid/privileged/install/InstallExtension.java
index 7308dcb94..0241c9251 100644
--- a/F-Droid/src/org/fdroid/fdroid/privileged/install/InstallExtension.java
+++ b/F-Droid/src/org/fdroid/fdroid/privileged/install/InstallExtension.java
@@ -42,7 +42,7 @@ abstract class InstallExtension {
 
     private static final String APK_FILE_NAME = "FDroidPrivileged.apk";
 
-    public InstallExtension(final Context context) {
+    InstallExtension(final Context context) {
         this.context = context;
     }
 
@@ -133,7 +133,7 @@ abstract class InstallExtension {
 
     private static class PreKitKatImpl extends InstallExtension {
 
-        public PreKitKatImpl(Context context) {
+        PreKitKatImpl(Context context) {
             super(context);
         }
 
@@ -146,7 +146,7 @@ abstract class InstallExtension {
 
     private static class KitKatToLollipopImpl extends InstallExtension {
 
-        public KitKatToLollipopImpl(Context context) {
+        KitKatToLollipopImpl(Context context) {
             super(context);
         }
 
@@ -167,7 +167,7 @@ abstract class InstallExtension {
      */
     private static class LollipopImpl extends InstallExtension {
 
-        public LollipopImpl(Context context) {
+        LollipopImpl(Context context) {
             super(context);
         }
 
diff --git a/F-Droid/src/org/fdroid/fdroid/privileged/views/TabsAdapter.java b/F-Droid/src/org/fdroid/fdroid/privileged/views/TabsAdapter.java
index 28e69cc4f..cafdbff6c 100644
--- a/F-Droid/src/org/fdroid/fdroid/privileged/views/TabsAdapter.java
+++ b/F-Droid/src/org/fdroid/fdroid/privileged/views/TabsAdapter.java
@@ -53,7 +53,7 @@ public class TabsAdapter extends PagerAdapter
     static class DummyTabFactory implements TabHost.TabContentFactory {
         private final Context mContext;
 
-        public DummyTabFactory(Context context) {
+        DummyTabFactory(Context context) {
             mContext = context;
         }
 
diff --git a/F-Droid/src/org/fdroid/fdroid/views/ManageReposActivity.java b/F-Droid/src/org/fdroid/fdroid/views/ManageReposActivity.java
index 80bd14f3b..7d3824197 100644
--- a/F-Droid/src/org/fdroid/fdroid/views/ManageReposActivity.java
+++ b/F-Droid/src/org/fdroid/fdroid/views/ManageReposActivity.java
@@ -219,7 +219,7 @@ public class ManageReposActivity extends ActionBarActivity {
 
         private AddRepoState addRepoState;
 
-        public AddRepo(String newAddress, String newFingerprint) {
+        AddRepo(String newAddress, String newFingerprint) {
 
             context = ManageReposActivity.this;
 
diff --git a/F-Droid/src/org/fdroid/fdroid/views/fragments/AvailableAppsFragment.java b/F-Droid/src/org/fdroid/fdroid/views/fragments/AvailableAppsFragment.java
index f7c1fa94e..896835ca6 100644
--- a/F-Droid/src/org/fdroid/fdroid/views/fragments/AvailableAppsFragment.java
+++ b/F-Droid/src/org/fdroid/fdroid/views/fragments/AvailableAppsFragment.java
@@ -65,7 +65,7 @@ public class AvailableAppsFragment extends AppListFragment implements
 
         private final ArrayAdapter<String> adapter;
 
-        public CategoryObserver(ArrayAdapter<String> adapter) {
+        CategoryObserver(ArrayAdapter<String> adapter) {
             super(null);
             this.adapter = adapter;
         }
diff --git a/F-Droid/src/org/fdroid/fdroid/views/swap/SelectAppsView.java b/F-Droid/src/org/fdroid/fdroid/views/swap/SelectAppsView.java
index 037e6b2c5..d990e213c 100644
--- a/F-Droid/src/org/fdroid/fdroid/views/swap/SelectAppsView.java
+++ b/F-Droid/src/org/fdroid/fdroid/views/swap/SelectAppsView.java
@@ -43,20 +43,20 @@ public class SelectAppsView extends ListView implements
         LoaderManager.LoaderCallbacks<Cursor>,
         SearchView.OnQueryTextListener {
 
-    public SelectAppsView(Context context) {
+    SelectAppsView(Context context) {
         super(context);
     }
 
-    public SelectAppsView(Context context, AttributeSet attrs) {
+    SelectAppsView(Context context, AttributeSet attrs) {
         super(context, attrs);
     }
 
-    public SelectAppsView(Context context, AttributeSet attrs, int defStyleAttr) {
+    SelectAppsView(Context context, AttributeSet attrs, int defStyleAttr) {
         super(context, attrs, defStyleAttr);
     }
 
     @TargetApi(Build.VERSION_CODES.LOLLIPOP)
-    public SelectAppsView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+    SelectAppsView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
         super(context, attrs, defStyleAttr, defStyleRes);
     }
 
@@ -223,7 +223,7 @@ public class SelectAppsView extends ListView implements
         @NonNull
         private final ListView listView;
 
-        public AppListAdapter(@NonNull ListView listView, @NonNull Context context, @Nullable Cursor c) {
+        AppListAdapter(@NonNull ListView listView, @NonNull Context context, @Nullable Cursor c) {
             super(context, c, FLAG_REGISTER_CONTENT_OBSERVER);
             this.listView = listView;
         }
diff --git a/F-Droid/src/org/fdroid/fdroid/views/swap/StartSwapView.java b/F-Droid/src/org/fdroid/fdroid/views/swap/StartSwapView.java
index e2d02651f..4352208e4 100644
--- a/F-Droid/src/org/fdroid/fdroid/views/swap/StartSwapView.java
+++ b/F-Droid/src/org/fdroid/fdroid/views/swap/StartSwapView.java
@@ -70,7 +70,7 @@ public class StartSwapView extends ScrollView implements SwapWorkflowActivity.In
 
     private class PeopleNearbyAdapter extends ArrayAdapter<Peer> {
 
-        public PeopleNearbyAdapter(Context context) {
+        PeopleNearbyAdapter(Context context) {
             super(context, 0, new ArrayList<Peer>());
         }
 
diff --git a/F-Droid/src/org/fdroid/fdroid/views/swap/SwapAppsView.java b/F-Droid/src/org/fdroid/fdroid/views/swap/SwapAppsView.java
index aee3a3a46..1cab0b43d 100644
--- a/F-Droid/src/org/fdroid/fdroid/views/swap/SwapAppsView.java
+++ b/F-Droid/src/org/fdroid/fdroid/views/swap/SwapAppsView.java
@@ -340,7 +340,7 @@ public class SwapAppsView extends ListView implements
                 }
             };
 
-            public ViewHolder() {
+            ViewHolder() {
                 // TODO: Unregister receivers correctly...
                 IntentFilter apkFilter = new IntentFilter(ApkDownloader.ACTION_STATUS);
                 LocalBroadcastManager.getInstance(getActivity()).registerReceiver(apkDownloadReceiver, apkFilter);
@@ -438,7 +438,7 @@ public class SwapAppsView extends ListView implements
         @Nullable
         private Drawable defaultAppIcon;
 
-        public AppListAdapter(@NonNull Context context, @Nullable Cursor c) {
+        AppListAdapter(@NonNull Context context, @Nullable Cursor c) {
             super(context, c, FLAG_REGISTER_CONTENT_OBSERVER);
         }
 
diff --git a/F-Droid/src/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java b/F-Droid/src/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java
index 45855e7d2..39f889f55 100644
--- a/F-Droid/src/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java
+++ b/F-Droid/src/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java
@@ -638,7 +638,7 @@ public class SwapWorkflowActivity extends AppCompatActivity {
     }
 
     class PrepareInitialSwapRepo extends PrepareSwapRepo {
-        public PrepareInitialSwapRepo() {
+        PrepareInitialSwapRepo() {
             super(new HashSet<>(Arrays.asList(new String[] {"org.fdroid.fdroid"})));
         }
     }
@@ -664,7 +664,7 @@ public class SwapWorkflowActivity extends AppCompatActivity {
         @NonNull
         protected final Context context;
 
-        public PrepareSwapRepo(@NonNull Set<String> apps) {
+        PrepareSwapRepo(@NonNull Set<String> apps) {
             context = SwapWorkflowActivity.this;
             selectedApps = apps;
             sharingUri = Utils.getSharingUri(FDroidApp.repo);
diff --git a/F-Droid/test/src/android/test/ProviderTestCase2MockContext.java b/F-Droid/test/src/android/test/ProviderTestCase2MockContext.java
index 1eabf9ba9..a3b6b57ad 100644
--- a/F-Droid/test/src/android/test/ProviderTestCase2MockContext.java
+++ b/F-Droid/test/src/android/test/ProviderTestCase2MockContext.java
@@ -95,6 +95,7 @@ public abstract class ProviderTestCase2MockContext<T extends ContentProvider> ex
             return this;
         }
     }
+
     /**
      * Constructor.
      *
diff --git a/F-Droid/test/src/org/fdroid/fdroid/BaseApkProviderTest.java b/F-Droid/test/src/org/fdroid/fdroid/BaseApkProviderTest.java
index 9d4b6bf62..c242a03cb 100644
--- a/F-Droid/test/src/org/fdroid/fdroid/BaseApkProviderTest.java
+++ b/F-Droid/test/src/org/fdroid/fdroid/BaseApkProviderTest.java
@@ -19,7 +19,7 @@ import java.util.List;
  */
 abstract class BaseApkProviderTest extends FDroidProviderTest<ApkProvider> {
 
-    public BaseApkProviderTest() {
+    BaseApkProviderTest() {
         super(ApkProvider.class, ApkProvider.getAuthority());
     }