Improved calibration performance
Removed redundant code/documentation