Code cleanup, fixed reservationcontroller