added comments to Calibrator and structured the source code a bit better