Commented use of block-stream, some cleanup