few codestyle fixes