Some reformatting per Patrick's comments