Fix codestyle issues