Small cleanup
Notifier class introduced