another few codestyle fixes