some codestyle fixes