multiple codestyle fixes