cli/streams: minor refactoring and docs touch-ups#4153

thaJeztah merged 1 commit intodocker:masterdocker/cli:masterfrom

thaJeztah:streams_cleanupthaJeztah/cli:streams_cleanupCopy head branch name to clipboard