Rewrap too long lines and fix layout.

The diff will get shorter once PR#142 is merged.