Code cleanup

Let's make Android Studio happy