Small cleanup
Tune Calibration