edited comments to Watcher class