Style fixes according to the style guide