More code cleanup

Again, to appease Android Studio