Reservation and Lesson refactoring