Lessons refactoring