Clean up and reformat