Cleaned up a few of the classes.