And also fix some spaces and formatting oddities in the code.

No functional change