Reformat some things