Rearranged some of the references so that they are easier to spot.