Cleaning Android layout code: Phase 1