Refactor notifier