Notifier (tested under OSX only for now)
Headers cleanup