Refactor android