Refactor: iOS code Alignment, Update iOS code