Android: Refactor some things