Tidied up some classes.