cleanup the model a little