Removed comments, Log.d() etc