Android Refactor