Refactored the RiskInput class
Minimal changes