minor cleanup -stream working