Notification fixes
refactoring