Swap order of two sections around
Wrap long lines
Fix typo