refactoring, more demo examples