Cleaned up some classes.