refactor(watcher) change newWatcher to Watch