Cleaning up RiskCalculator