A little more work on cleaning up the models.