Refactoring the Booking model, controller and views