Refactor the Android coide