Simplify watchers set up