Reservation controller refactoring