android refactor