#19 - Refactored calibration workflow