Cleanup based on Android Studio code inspection