Reformat some more stuff