Cosmetic changse to the Class and related classes.