diff --git a/src/org/fdroid/fdroid/AppDetails.java b/src/org/fdroid/fdroid/AppDetails.java
index 001763ae7..76c5c2ee5 100644
--- a/src/org/fdroid/fdroid/AppDetails.java
+++ b/src/org/fdroid/fdroid/AppDetails.java
@@ -165,7 +165,7 @@ public class AppDetails extends ActionBarActivity implements ProgressListener, A
         public ApkListAdapter(Context context, App app) {
             super(context, 0);
             List<Apk> apks = ApkProvider.Helper.findByApp(context, app.id);
-            for (Apk apk : apks ) {
+            for (Apk apk : apks) {
                 if (apk.compatible || Preferences.get().showIncompatibleVersions()) {
                     add(apk);
                 }
@@ -1169,7 +1169,7 @@ public class AppDetails extends ActionBarActivity implements ProgressListener, A
             TextView permissionHeader = (TextView) view.findViewById(R.id.permissions);
             boolean curApkCompatible = curApk != null && curApk.compatible;
             if (prefs.showPermissions() && !getApks().isEmpty() &&
-                    ( curApkCompatible || prefs.showIncompatibleVersions() ) ) {
+                    (curApkCompatible || prefs.showIncompatibleVersions())) {
 
                 CommaSeparatedList permsList = getApks().getItem(0).permissions;
                 if (permsList == null) {
@@ -1448,4 +1448,4 @@ public class AppDetails extends ActionBarActivity implements ProgressListener, A
         }
     }
 
-}
\ No newline at end of file
+}
diff --git a/src/org/fdroid/fdroid/FDroid.java b/src/org/fdroid/fdroid/FDroid.java
index 85d142f25..18d610e52 100644
--- a/src/org/fdroid/fdroid/FDroid.java
+++ b/src/org/fdroid/fdroid/FDroid.java
@@ -278,7 +278,7 @@ public class FDroid extends ActionBarActivity {
         viewPager = (ViewPager)findViewById(R.id.main_pager);
         AppListFragmentPagerAdapter viewPagerAdapter = new AppListFragmentPagerAdapter(this);
         viewPager.setAdapter(viewPagerAdapter);
-        viewPager.setOnPageChangeListener( new ViewPager.SimpleOnPageChangeListener() {
+        viewPager.setOnPageChangeListener(new ViewPager.SimpleOnPageChangeListener() {
             @Override
             public void onPageSelected(int position) {
                 getTabManager().selectTab(position);
diff --git a/src/org/fdroid/fdroid/PackageReceiver.java b/src/org/fdroid/fdroid/PackageReceiver.java
index 3ddb4f273..7f1c3f02b 100644
--- a/src/org/fdroid/fdroid/PackageReceiver.java
+++ b/src/org/fdroid/fdroid/PackageReceiver.java
@@ -33,7 +33,7 @@ abstract class PackageReceiver extends BroadcastReceiver {
     abstract protected void handle(Context context, String appId);
 
     protected PackageInfo getPackageInfo(Context context, String appId) {
-        for( PackageInfo info : context.getPackageManager().getInstalledPackages(0)) {
+        for (PackageInfo info : context.getPackageManager().getInstalledPackages(0)) {
             if (info.packageName.equals(appId)) {
                 return info;
             }
diff --git a/src/org/fdroid/fdroid/Preferences.java b/src/org/fdroid/fdroid/Preferences.java
index f8da4a214..448db5031 100644
--- a/src/org/fdroid/fdroid/Preferences.java
+++ b/src/org/fdroid/fdroid/Preferences.java
@@ -215,27 +215,27 @@ public class Preferences implements SharedPreferences.OnSharedPreferenceChangeLi
         uninitialize(key);
 
         if (key.equals(PREF_COMPACT_LAYOUT)) {
-            for ( ChangeListener listener : compactLayoutListeners )  {
+            for (ChangeListener listener : compactLayoutListeners)  {
                 listener.onPreferenceChange();
             }
         } else if (key.equals(PREF_ROOTED)) {
-            for ( ChangeListener listener : filterAppsRequiringRootListeners ) {
+            for (ChangeListener listener : filterAppsRequiringRootListeners) {
                 listener.onPreferenceChange();
             }
         } else if (key.equals(PREF_UPD_HISTORY)) {
-            for ( ChangeListener listener : updateHistoryListeners ) {
+            for (ChangeListener listener : updateHistoryListeners) {
                 listener.onPreferenceChange();
             }
         } else if (key.equals(PREF_LOCAL_REPO_BONJOUR)) {
-            for ( ChangeListener listener : localRepoBonjourListeners ) {
+            for (ChangeListener listener : localRepoBonjourListeners) {
                 listener.onPreferenceChange();
             }
         } else if (key.equals(PREF_LOCAL_REPO_NAME)) {
-            for ( ChangeListener listener : localRepoNameListeners ) {
+            for (ChangeListener listener : localRepoNameListeners) {
                 listener.onPreferenceChange();
             }
         } else if (key.equals(PREF_LOCAL_REPO_HTTPS)) {
-            for ( ChangeListener listener : localRepoHttpsListeners ) {
+            for (ChangeListener listener : localRepoHttpsListeners) {
                 listener.onPreferenceChange();
             }
         }
diff --git a/src/org/fdroid/fdroid/PreferencesActivity.java b/src/org/fdroid/fdroid/PreferencesActivity.java
index cc7c4940b..8615d4753 100644
--- a/src/org/fdroid/fdroid/PreferencesActivity.java
+++ b/src/org/fdroid/fdroid/PreferencesActivity.java
@@ -43,7 +43,7 @@ public class PreferencesActivity extends ActionBarActivity {
             // a (bug?) thing in 3.0, 3.1 which requires setContentView to be invoked before
             // the actionbar is played with:
             // http://blog.perpetumdesign.com/2011/08/strange-case-of-dr-action-and-mr-bar.html
-            setContentView( new LinearLayout(this) );
+            setContentView(new LinearLayout(this));
 
             PreferenceFragment preferenceFragment = new PreferenceFragment();
             fm.beginTransaction()
diff --git a/src/org/fdroid/fdroid/SearchResults.java b/src/org/fdroid/fdroid/SearchResults.java
index 08bab2480..766b06f22 100644
--- a/src/org/fdroid/fdroid/SearchResults.java
+++ b/src/org/fdroid/fdroid/SearchResults.java
@@ -50,7 +50,7 @@ public class SearchResults extends ActionBarActivity {
             // a (bug?) thing in 3.0, 3.1 which requires setContentView to be invoked before
             // the actionbar is played with:
             // http://blog.perpetumdesign.com/2011/08/strange-case-of-dr-action-and-mr-bar.html
-            setContentView( new LinearLayout(this) );
+            setContentView(new LinearLayout(this));
 
             SearchResultsFragment fragment = new SearchResultsFragment();
             fm.beginTransaction().add(android.R.id.content, fragment).commit();
diff --git a/src/org/fdroid/fdroid/Utils.java b/src/org/fdroid/fdroid/Utils.java
index ea97f786d..f7d77dd24 100644
--- a/src/org/fdroid/fdroid/Utils.java
+++ b/src/org/fdroid/fdroid/Utils.java
@@ -369,7 +369,7 @@ public final class Utils {
                 return null;
             else {
                 StringBuilder sb = new StringBuilder();
-                for(int i = 0; i < list.size(); i ++) {
+                for (int i = 0; i < list.size(); i++) {
                     if (i > 0) {
                         sb.append(',');
                     }
diff --git a/src/org/fdroid/fdroid/compat/ContextCompat.java b/src/org/fdroid/fdroid/compat/ContextCompat.java
index 0daeabf5d..f8e5104dd 100644
--- a/src/org/fdroid/fdroid/compat/ContextCompat.java
+++ b/src/org/fdroid/fdroid/compat/ContextCompat.java
@@ -18,7 +18,7 @@ public abstract class ContextCompat extends Compatibility {
 
     protected final Context context;
 
-    public ContextCompat(Context context ) {
+    public ContextCompat(Context context) {
         this.context = context;
     }
 
diff --git a/src/org/fdroid/fdroid/data/Apk.java b/src/org/fdroid/fdroid/data/Apk.java
index a6d08edb4..6177f6e9a 100644
--- a/src/org/fdroid/fdroid/data/Apk.java
+++ b/src/org/fdroid/fdroid/data/Apk.java
@@ -62,7 +62,7 @@ public class Apk extends ValueObject implements Comparable<Apk> {
 
         checkCursorPosition(cursor);
 
-        for(int i = 0; i < cursor.getColumnCount(); i ++ ) {
+        for (int i = 0; i < cursor.getColumnCount(); i++) {
             String column = cursor.getColumnName(i);
             if (column.equals(ApkProvider.DataColumns.HASH)) {
                 hash = cursor.getString(i);
diff --git a/src/org/fdroid/fdroid/data/App.java b/src/org/fdroid/fdroid/data/App.java
index 0d6fdc904..fd4af837c 100644
--- a/src/org/fdroid/fdroid/data/App.java
+++ b/src/org/fdroid/fdroid/data/App.java
@@ -110,7 +110,7 @@ public class App extends ValueObject implements Comparable<App> {
 
         checkCursorPosition(cursor);
 
-        for(int i = 0; i < cursor.getColumnCount(); i ++ ) {
+        for (int i = 0; i < cursor.getColumnCount(); i++) {
             String column = cursor.getColumnName(i);
             if (column.equals(AppProvider.DataColumns.IS_COMPATIBLE)) {
                 compatible = cursor.getInt(i) == 1;
diff --git a/src/org/fdroid/fdroid/data/DBHelper.java b/src/org/fdroid/fdroid/data/DBHelper.java
index a162f736d..7570243b3 100644
--- a/src/org/fdroid/fdroid/data/DBHelper.java
+++ b/src/org/fdroid/fdroid/data/DBHelper.java
@@ -122,7 +122,7 @@ public class DBHelper extends SQLiteOpenHelper {
                         ContentValues values = new ContentValues(1);
                         String name = Repo.addressToName(address);
                         values.put("name", name);
-                        String[] args = { Long.toString( id ) };
+                        String[] args = { Long.toString(id) };
                         Log.i("FDroid", "Setting repo name to '" + name + "' for repo " + address);
                         db.update(TABLE_REPO, values, "_id = ?", args);
                         cursor.moveToNext();
@@ -442,7 +442,7 @@ public class DBHelper extends SQLiteOpenHelper {
 
     private static boolean columnExists(SQLiteDatabase db,
             String table, String column) {
-        return (db.rawQuery( "select * from " + table + " limit 0,1", null )
+        return (db.rawQuery("select * from " + table + " limit 0,1", null)
                 .getColumnIndex(column) != -1);
     }
 
diff --git a/src/org/fdroid/fdroid/data/InstalledAppCacheUpdater.java b/src/org/fdroid/fdroid/data/InstalledAppCacheUpdater.java
index a9fbf15fe..ae08f275b 100644
--- a/src/org/fdroid/fdroid/data/InstalledAppCacheUpdater.java
+++ b/src/org/fdroid/fdroid/data/InstalledAppCacheUpdater.java
@@ -119,7 +119,7 @@ public class InstalledAppCacheUpdater {
         }
 
         if (cachedInfo.size() > 0) {
-            for (Map.Entry<String, Integer> entry : cachedInfo.entrySet() ) {
+            for (Map.Entry<String, Integer> entry : cachedInfo.entrySet()) {
                 toDelete.add(entry.getKey());
             }
         }
diff --git a/src/org/fdroid/fdroid/data/InstalledAppProvider.java b/src/org/fdroid/fdroid/data/InstalledAppProvider.java
index aa584ffad..04c9b091f 100644
--- a/src/org/fdroid/fdroid/data/InstalledAppProvider.java
+++ b/src/org/fdroid/fdroid/data/InstalledAppProvider.java
@@ -124,11 +124,11 @@ public class InstalledAppProvider extends FDroidProvider {
     }
 
     private QuerySelection queryApp(String appId) {
-        return new QuerySelection("appId = ?", new String[] { appId } );
+        return new QuerySelection("appId = ?", new String[]{ appId });
     }
 
     private QuerySelection querySearch(String keywords) {
-        return new QuerySelection("applicationLabel LIKE ?", new String[] { "%" + keywords + "%" } );
+        return new QuerySelection("applicationLabel LIKE ?", new String[]{ "%" + keywords + "%" });
     }
 
     @Override
diff --git a/src/org/fdroid/fdroid/data/QuerySelection.java b/src/org/fdroid/fdroid/data/QuerySelection.java
index 7c22283f2..306fa717b 100644
--- a/src/org/fdroid/fdroid/data/QuerySelection.java
+++ b/src/org/fdroid/fdroid/data/QuerySelection.java
@@ -27,7 +27,7 @@ public class QuerySelection {
 
     public QuerySelection(String selection, List<String> args) {
         this.args = new String[ args.size() ];
-        args.toArray( this.args );
+        args.toArray(this.args);
         this.selection = selection;
     }
 
@@ -57,7 +57,7 @@ public class QuerySelection {
             s = " (" + this.selection + ") AND (" + query.getSelection() + ") ";
         } else if (this.hasSelection()) {
             s = this.selection;
-        } else if (query.hasSelection() ) {
+        } else if (query.hasSelection()) {
             s = query.selection;
         }
 
diff --git a/src/org/fdroid/fdroid/data/Repo.java b/src/org/fdroid/fdroid/data/Repo.java
index 64d6b3f78..6f7755710 100644
--- a/src/org/fdroid/fdroid/data/Repo.java
+++ b/src/org/fdroid/fdroid/data/Repo.java
@@ -37,7 +37,7 @@ public class Repo extends ValueObject {
 
         checkCursorPosition(cursor);
 
-        for(int i = 0; i < cursor.getColumnCount(); i ++ ) {
+        for (int i = 0; i < cursor.getColumnCount(); i++) {
             String column = cursor.getColumnName(i);
             if (column.equals(RepoProvider.DataColumns._ID)) {
                 id = cursor.getInt(i);
diff --git a/src/org/fdroid/fdroid/views/AppListFragmentPagerAdapter.java b/src/org/fdroid/fdroid/views/AppListFragmentPagerAdapter.java
index e56881b9a..b79616ba3 100644
--- a/src/org/fdroid/fdroid/views/AppListFragmentPagerAdapter.java
+++ b/src/org/fdroid/fdroid/views/AppListFragmentPagerAdapter.java
@@ -32,10 +32,10 @@ public class AppListFragmentPagerAdapter extends FragmentPagerAdapter {
 
     @Override
     public Fragment getItem(int i) {
-        if ( i == 0 ) {
+        if (i == 0) {
             return new AvailableAppsFragment();
         }
-        if ( i == 1 ) {
+        if (i == 1) {
             return new InstalledAppsFragment();
         }
         return new CanUpdateAppsFragment();
diff --git a/src/org/fdroid/fdroid/views/RepoDetailsActivity.java b/src/org/fdroid/fdroid/views/RepoDetailsActivity.java
index 495603692..6516e106f 100644
--- a/src/org/fdroid/fdroid/views/RepoDetailsActivity.java
+++ b/src/org/fdroid/fdroid/views/RepoDetailsActivity.java
@@ -44,7 +44,7 @@ public class RepoDetailsActivity extends ActionBarActivity {
             // a (bug?) thing in 3.0, 3.1 which requires setContentView to be invoked before
             // the actionbar is played with:
             // http://blog.perpetumdesign.com/2011/08/strange-case-of-dr-action-and-mr-bar.html
-            setContentView( new LinearLayout(this) );
+            setContentView(new LinearLayout(this));
 
             RepoDetailsFragment fragment = new RepoDetailsFragment();
             fragment.setArguments(getIntent().getExtras());
diff --git a/src/org/fdroid/fdroid/views/fragments/AvailableAppsFragment.java b/src/org/fdroid/fdroid/views/fragments/AvailableAppsFragment.java
index 85042332f..ed746138f 100644
--- a/src/org/fdroid/fdroid/views/fragments/AvailableAppsFragment.java
+++ b/src/org/fdroid/fdroid/views/fragments/AvailableAppsFragment.java
@@ -75,7 +75,7 @@ public class AvailableAppsFragment extends AppListFragment implements
             // Wanted to just do this update here, but android tells
             // me that "Only the original thread that created a view
             // hierarchy can touch its views."
-            getActivity().runOnUiThread( new Runnable() {
+            getActivity().runOnUiThread(new Runnable() {
                 @Override
                 public void run() {
                     adapter.clear();
diff --git a/src/org/fdroid/fdroid/views/fragments/RepoDetailsFragment.java b/src/org/fdroid/fdroid/views/fragments/RepoDetailsFragment.java
index a831193ad..99a4d079c 100644
--- a/src/org/fdroid/fdroid/views/fragments/RepoDetailsFragment.java
+++ b/src/org/fdroid/fdroid/views/fragments/RepoDetailsFragment.java
@@ -275,7 +275,7 @@ public class RepoDetailsFragment extends Fragment {
         update.setIcon(R.drawable.ic_menu_refresh);
         MenuItemCompat.setShowAsAction(update,
             MenuItemCompat.SHOW_AS_ACTION_ALWAYS |
-            MenuItemCompat.SHOW_AS_ACTION_WITH_TEXT );
+            MenuItemCompat.SHOW_AS_ACTION_WITH_TEXT);
 
         MenuItem delete = menu.add(Menu.NONE, DELETE, 0, R.string.delete);
         delete.setIcon(android.R.drawable.ic_menu_delete);
diff --git a/src/org/fdroid/fdroid/views/fragments/SearchResultsFragment.java b/src/org/fdroid/fdroid/views/fragments/SearchResultsFragment.java
index a2f017be8..fca4ae38d 100644
--- a/src/org/fdroid/fdroid/views/fragments/SearchResultsFragment.java
+++ b/src/org/fdroid/fdroid/views/fragments/SearchResultsFragment.java
@@ -41,7 +41,7 @@ public class SearchResultsFragment extends ListFragment implements LoaderManager
                 query = data.getQueryParameter("q");
                 if (query != null && query.startsWith("pname:"))
                     query = query.substring(6);
-            } else if (data!= null ) {
+            } else if (data!= null) {
                 query = data.getEncodedSchemeSpecificPart();
             }
         }