Refactored controller into Scenario