Refactoring demodata