Copy, formatting, and whitespace changes