Change code formatting to Android Studio default
Attempt clean-up, help from Android Studio.