Reformat some classes