Refactor entire android version