Refactoring, some stream watchers.