Refactor Calibration