minor refactoring, quiet operation of streamer