Improve streams

It can, but doesn't have to. Was too lazy.