refactoring the notifier