reformat and add simple processing for class declarations