refactoring | making changes in push notifications