Clean stream output
Merge branch 'clean-stream-output'