Mostly "whitespace" changes to format to an 80-column convention where easy to do