TIDY UP THE CLASSES