Some cleanup of HotelDetails, ready for unit tests!