Cleaning code, added the scenario total runtime.