refactor the Terminal Notifier