Slight spacing fixup
Misc formatting corrections, eliminating switch-in-for antipattern, other simplifications