Started refactoring in the android app