diff --git a/api/src/com/todoroo/andlib/data/AbstractDatabase.java b/api/src/com/todoroo/andlib/data/AbstractDatabase.java
index 05937031b..398062d02 100644
--- a/api/src/com/todoroo/andlib/data/AbstractDatabase.java
+++ b/api/src/com/todoroo/andlib/data/AbstractDatabase.java
@@ -9,8 +9,8 @@ import android.content.ContentValues;
 import android.content.Context;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
-import android.database.sqlite.SQLiteOpenHelper;
 import android.database.sqlite.SQLiteDatabase.CursorFactory;
+import android.database.sqlite.SQLiteOpenHelper;
 import android.util.Log;
 
 import com.todoroo.andlib.data.Property.PropertyVisitor;
diff --git a/api/src/com/todoroo/astrid/data/StoreObject.java b/api/src/com/todoroo/astrid/data/StoreObject.java
index b80d6da38..1b853da83 100644
--- a/api/src/com/todoroo/astrid/data/StoreObject.java
+++ b/api/src/com/todoroo/astrid/data/StoreObject.java
@@ -9,10 +9,10 @@ import android.net.Uri;
 
 import com.todoroo.andlib.data.AbstractModel;
 import com.todoroo.andlib.data.Property;
-import com.todoroo.andlib.data.Table;
-import com.todoroo.andlib.data.TodorooCursor;
 import com.todoroo.andlib.data.Property.LongProperty;
 import com.todoroo.andlib.data.Property.StringProperty;
+import com.todoroo.andlib.data.Table;
+import com.todoroo.andlib.data.TodorooCursor;
 import com.todoroo.astrid.api.AstridApiConstants;
 
 /**
diff --git a/api/src/com/todoroo/astrid/sync/SyncMetadataService.java b/api/src/com/todoroo/astrid/sync/SyncMetadataService.java
index 108025aec..07eafd971 100644
--- a/api/src/com/todoroo/astrid/sync/SyncMetadataService.java
+++ b/api/src/com/todoroo/astrid/sync/SyncMetadataService.java
@@ -14,9 +14,9 @@ import com.todoroo.andlib.sql.Order;
 import com.todoroo.andlib.sql.Query;
 import com.todoroo.astrid.data.Metadata;
 import com.todoroo.astrid.data.MetadataApiDao;
+import com.todoroo.astrid.data.MetadataApiDao.MetadataCriteria;
 import com.todoroo.astrid.data.Task;
 import com.todoroo.astrid.data.TaskApiDao;
-import com.todoroo.astrid.data.MetadataApiDao.MetadataCriteria;
 import com.todoroo.astrid.data.TaskApiDao.TaskCriteria;
 
 abstract public class SyncMetadataService<TYPE extends SyncContainer> {
diff --git a/greendroid/GreenDroid/src/greendroid/app/GDActivity.java b/greendroid/GreenDroid/src/greendroid/app/GDActivity.java
index fba8560c6..0ef06f1c5 100644
--- a/greendroid/GreenDroid/src/greendroid/app/GDActivity.java
+++ b/greendroid/GreenDroid/src/greendroid/app/GDActivity.java
@@ -15,14 +15,12 @@
  */
 package greendroid.app;
 
-import com.cyrilmottier.android.greendroid.R;
-
 import greendroid.util.Config;
 import greendroid.widget.ActionBar;
-import greendroid.widget.ActionBarHost;
-import greendroid.widget.ActionBarItem;
 import greendroid.widget.ActionBar.OnActionBarListener;
 import greendroid.widget.ActionBar.Type;
+import greendroid.widget.ActionBarHost;
+import greendroid.widget.ActionBarItem;
 import android.app.Activity;
 import android.content.Intent;
 import android.content.pm.ActivityInfo;
@@ -34,6 +32,8 @@ import android.view.View;
 import android.view.ViewGroup.LayoutParams;
 import android.widget.FrameLayout;
 
+import com.cyrilmottier.android.greendroid.R;
+
 /**
  * <p>
  * An {@link GDActivity} is a regular Activity that always hosts an
diff --git a/greendroid/GreenDroid/src/greendroid/widget/LoaderActionBarItem.java b/greendroid/GreenDroid/src/greendroid/widget/LoaderActionBarItem.java
index 2f505d665..b744f257f 100644
--- a/greendroid/GreenDroid/src/greendroid/widget/LoaderActionBarItem.java
+++ b/greendroid/GreenDroid/src/greendroid/widget/LoaderActionBarItem.java
@@ -17,6 +17,7 @@ package greendroid.widget;
 
 import android.view.LayoutInflater;
 import android.view.View;
+import android.widget.ProgressBar;
 
 import com.cyrilmottier.android.greendroid.R;
 
diff --git a/greendroid/GreenDroid/src/greendroid/widget/QuickActionBar.java b/greendroid/GreenDroid/src/greendroid/widget/QuickActionBar.java
index 0980e1737..45895bba7 100644
--- a/greendroid/GreenDroid/src/greendroid/widget/QuickActionBar.java
+++ b/greendroid/GreenDroid/src/greendroid/widget/QuickActionBar.java
@@ -25,7 +25,6 @@ import android.view.View;
 import android.view.View.MeasureSpec;
 import android.view.View.OnClickListener;
 import android.view.ViewGroup;
-import android.view.ViewGroup.LayoutParams;
 import android.view.animation.Animation;
 import android.view.animation.AnimationUtils;
 import android.view.animation.Interpolator;
@@ -33,8 +32,6 @@ import android.widget.FrameLayout;
 import android.widget.HorizontalScrollView;
 import android.widget.ListView;
 import android.widget.TextView;
-import android.widget.LinearLayout;
-
 
 import com.cyrilmottier.android.greendroid.R;