Refactor and clarify demo scenarios.