All the whitespace changes in here really add to the line count, and I'm not even sure it was needed now.

Should I see if I can revert that part and have it still work?