Refactor Lesson 1