make it cleaner
$watch/$unwatch