refactoring of stream structures