Start to clean up the model access code.