clean up the models, a little