WatcherS are now instance fields

applied feedback from @jsirois