Refactoring around individual lessons.