iOS App refactor