Improve streams

Additional symmetry looks nicer indeed.