Small cleanup changes in the PushNotifier