Tutorial Refactoring