Code cleanup. Mostly space fixing.

Now passes git diff --check.
undo damage from overaggressive backspacer