[Reservations] Refactor previous commits.