Refactor to Android Studio Format