Fixed some coding style details
Removed unecessary SubStream indirection