A bunch of minor formatting and whitespace changes