Refactor CalculationStepManager