Improve `watch_files`;