Refactoring stream handling