Improve style in places

[jeremypw]

• Reduce some long lines
• Insert some required blank lines
• Fix tabs

Extracted from other PR. Should not cause any functional change.