cleaned up watcher.js