Rewrote calibration to use a parameterized class
Renamed distanceCalc to distance_calc