Refactorings
Improved handling for opening notifications from push message