Some cleanup, also some Booking lookup methods