Reformat code to follow standard