Lesson refactor