Improve webpack watcher