Improvements in bookingdotcom code