refactoring - scenario, agents, data