Tightening pass on Watcher