Cleaned up classes.