Refactor code a littlr; Add a notification helper class: Notifier