some android refactorings