Improve streams

No it's fine.