Remove duplication from watch.rb