Fixed up the formatting as a result of the recent merge catastrophe