Play with the model, cleanup a bit
Update