Demo refactoring.