Tidy up with the new Bid definition