Refactoring android-client