(Android) Refactor more code