fixed problems found with Android Studio inspection tool