More codestyle fixes