codestyle fixes (due to cr notes)