Gii codestyle fixes #2