remove nosiy comment
refactor watchers