reformat class properly