Refactoring demos set up step2