Refactoring iOS push