More refactoring in the android app.