refactoring
refactoring....... -____-
Merge pull request #171 from joh641/refactor/reservations

refactoring