Cleanup and reformat the whole thing