misc codestyle fixes