Cleaned up code, Android compile complete