In progress: [Issue 179] Add support for 'stream'

Code cleanup.
14 files changed