Adding recent reformatting by Brian