Refactoring demos