Change CalculationStepManager static methods into instance methods