Fix codestyle violations