Cleanup the model, some minor changes.