Some codestyle fixes