Minor edits, line length, whitespace cleanup

Truly serious stuff