Some refactoring
Reservation handler completed, specs for caller