Filewatcher cleanup and commenting