switching to Android Studio, let it do some code reformatting as a start