Streams 159

Pull request open on apache too.
No, I just thought it made the code more readable.