Improve streams

Secondary constructors should come first (before fields). At least that's what is customary in this codebase.