cleaned up calibrator