clean up stream function to use -stream- everyehwere