Tidy up the model example