Watcher: code cleanup