Simplify watch task