create evaluateCalibration function and cleaner organization of model objects