Code refactor

remove extraneous stream