Android refactorings