More work on cleaning up classes.