Reformat some stuff