Stream refactorings and additions