All formatting and whitespace changes