Refactor/Simplify stream classes