refactored notification

notification refactor