Minor refactoring, filewatcher changes