Reformat
Simplified the model.