Simplified the risk calculators

See