#69 Cleaned up some of the model objects.