Some codestyle fixes.