Improve streams

These two should be allocated once and for all as private vals in the class.