Android refactoring