Android refactored