notifier refactoring