Reformat according to the style guide