diff --git a/F-Droid/src/org/fdroid/fdroid/UpdateService.java b/F-Droid/src/org/fdroid/fdroid/UpdateService.java
index 686c6cf1e..282b7e2fa 100644
--- a/F-Droid/src/org/fdroid/fdroid/UpdateService.java
+++ b/F-Droid/src/org/fdroid/fdroid/UpdateService.java
@@ -541,7 +541,7 @@ public class UpdateService extends IntentService implements ProgressListener {
     private List<String> getKnownAppIdsFromProvider(List<App> apps) {
 
         final Uri uri = AppProvider.getContentUri(apps);
-        String[] fields = new String[] { AppProvider.DataColumns.APP_ID };
+        String[] fields = { AppProvider.DataColumns.APP_ID };
         Cursor cursor = getContentResolver().query(uri, fields, null, null, null);
 
         int knownIdCount = cursor != null ? cursor.getCount() : 0;
diff --git a/F-Droid/src/org/fdroid/fdroid/data/ApkProvider.java b/F-Droid/src/org/fdroid/fdroid/data/ApkProvider.java
index 6a15fe34b..6082265d4 100644
--- a/F-Droid/src/org/fdroid/fdroid/data/ApkProvider.java
+++ b/F-Droid/src/org/fdroid/fdroid/data/ApkProvider.java
@@ -301,13 +301,13 @@ public class ApkProvider extends FDroidProvider {
 
     private QuerySelection queryApp(String appId) {
         String selection = DataColumns.APK_ID + " = ? ";
-        String[] args = new String[] { appId };
+        String[] args = { appId };
         return new QuerySelection(selection, args);
     }
 
     private QuerySelection querySingle(Uri uri) {
         String selection = " vercode = ? and id = ? ";
-        String[] args = new String[] {
+        String[] args = {
             // First (0th) path segment is the word "apk",
             // and we are not interested in it.
             uri.getPathSegments().get(1),
@@ -318,7 +318,7 @@ public class ApkProvider extends FDroidProvider {
 
     private QuerySelection queryRepo(long repoId) {
         String selection = DataColumns.REPO_ID + " = ? ";
-        String[] args = new String[]{ Long.toString(repoId) };
+        String[] args = { Long.toString(repoId) };
         return new QuerySelection(selection, args);
     }
 
diff --git a/F-Droid/src/org/fdroid/fdroid/data/AppProvider.java b/F-Droid/src/org/fdroid/fdroid/data/AppProvider.java
index e0a951183..779b7d365 100644
--- a/F-Droid/src/org/fdroid/fdroid/data/AppProvider.java
+++ b/F-Droid/src/org/fdroid/fdroid/data/AppProvider.java
@@ -21,7 +21,7 @@ public class AppProvider extends FDroidProvider {
         private Helper() {}
 
         public static int count(Context context, Uri uri) {
-            String[] projection = new String[] { AppProvider.DataColumns._COUNT };
+            String[] projection = { AppProvider.DataColumns._COUNT };
             Cursor cursor = context.getContentResolver().query(uri, projection, null, null, null);
             int count = 0;
             if (cursor != null && cursor.getCount() == 1) {
diff --git a/F-Droid/src/org/fdroid/fdroid/installer/SystemInstaller.java b/F-Droid/src/org/fdroid/fdroid/installer/SystemInstaller.java
index 686ff3107..cd0e8ad7a 100644
--- a/F-Droid/src/org/fdroid/fdroid/installer/SystemInstaller.java
+++ b/F-Droid/src/org/fdroid/fdroid/installer/SystemInstaller.java
@@ -72,11 +72,11 @@ public class SystemInstaller extends Installer {
         mDeleteObserver = new PackageDeleteObserver();
 
         try {
-            Class<?>[] installTypes = new Class[] {
+            Class<?>[] installTypes = {
                     Uri.class, IPackageInstallObserver.class, int.class,
                     String.class
             };
-            Class<?>[] deleteTypes = new Class[] {
+            Class<?>[] deleteTypes = {
                     String.class, IPackageDeleteObserver.class,
                     int.class
             };
diff --git a/F-Droid/src/org/fdroid/fdroid/localrepo/LocalRepoKeyStore.java b/F-Droid/src/org/fdroid/fdroid/localrepo/LocalRepoKeyStore.java
index ab014ad03..e6f0d4f4e 100644
--- a/F-Droid/src/org/fdroid/fdroid/localrepo/LocalRepoKeyStore.java
+++ b/F-Droid/src/org/fdroid/fdroid/localrepo/LocalRepoKeyStore.java
@@ -271,7 +271,7 @@ public class LocalRepoKeyStore {
     private void addToStore(String alias, KeyPair kp, Certificate cert) throws KeyStoreException,
             NoSuchAlgorithmException, CertificateException, FileNotFoundException, IOException,
             UnrecoverableKeyException {
-        Certificate[] chain = new Certificate[] {
+        Certificate[] chain = {
                 cert
         };
         keyStore.setKeyEntry(alias, kp.getPrivate(),
diff --git a/F-Droid/src/org/fdroid/fdroid/net/MDnsHelper.java b/F-Droid/src/org/fdroid/fdroid/net/MDnsHelper.java
index 9805ef9bb..a1d8e5e25 100644
--- a/F-Droid/src/org/fdroid/fdroid/net/MDnsHelper.java
+++ b/F-Droid/src/org/fdroid/fdroid/net/MDnsHelper.java
@@ -94,7 +94,7 @@ public class MDnsHelper implements ServiceListener {
             protected Void doInBackground(Void... params) {
                 try {
                     int ip = wifiManager.getConnectionInfo().getIpAddress();
-                    byte[] byteIp = new byte[] {
+                    byte[] byteIp = {
                             (byte) (ip & 0xff),
                             (byte) (ip >> 8 & 0xff),
                             (byte) (ip >> 16 & 0xff),
diff --git a/F-Droid/src/org/fdroid/fdroid/views/ManageReposActivity.java b/F-Droid/src/org/fdroid/fdroid/views/ManageReposActivity.java
index b5a33c28b..eb39e5e84 100644
--- a/F-Droid/src/org/fdroid/fdroid/views/ManageReposActivity.java
+++ b/F-Droid/src/org/fdroid/fdroid/views/ManageReposActivity.java
@@ -613,7 +613,7 @@ public class ManageReposActivity extends ActionBarActivity {
         public Loader<Cursor> onCreateLoader(int i, Bundle bundle) {
             Uri uri = RepoProvider.getContentUri();
             Log.i(TAG, "Creating repo loader '" + uri + "'.");
-            String[] projection = new String[] {
+            String[] projection = {
                     RepoProvider.DataColumns._ID,
                     RepoProvider.DataColumns.NAME,
                     RepoProvider.DataColumns.PUBLIC_KEY,
diff --git a/F-Droid/src/org/fdroid/fdroid/views/RepoDetailsActivity.java b/F-Droid/src/org/fdroid/fdroid/views/RepoDetailsActivity.java
index e18bce466..8968da71a 100644
--- a/F-Droid/src/org/fdroid/fdroid/views/RepoDetailsActivity.java
+++ b/F-Droid/src/org/fdroid/fdroid/views/RepoDetailsActivity.java
@@ -53,7 +53,7 @@ public class RepoDetailsActivity extends ActionBarActivity {
                     .commit();
         }
 
-        String[] projection = new String[] {
+        String[] projection = {
                 RepoProvider.DataColumns.NAME,
                 RepoProvider.DataColumns.ADDRESS,
                 RepoProvider.DataColumns.FINGERPRINT