watcher style fixes