make improvements concerning class