Fixed a misprint in the scenario calculator
Some cleanup