Refactoring Demos set up, step 1