cleaned up the model