#Android: Refactor