Had to clean up the code in RiskService