Refactoring stream ing towards 100 line limit, some refactoring in soundsystem