More android refactorings