streaming improved
clean up