Reformat the code to match current conventions.