Refactor Scenario