Reformat and fix.