Some calibration ambience and refactoring