minor cleanups to streaming tools