Reformat some things.