Refactor notifiers