fixed streams and codestyle