refactoring...
Merge pull request #167 from joh641/refactor/reservations

refactoring...