Fix codestyle warnings