Cleanup code and fix `watch_files`;