Reformat code to style guide