Refactored demo scene