#608 - Codestyle fixes.