android/is refactoring