Remove JSDoc style comments
Refactoring watch commands