Reformat code before further cleanup.