notifier refactored for better reading