more classes formatting fixes