Code quality changes
Migrated notifier to AsyncNotifer instead of ThreadedNotifier - more perfomance, no thread used per active watcher