Whitespace adjustments
PEP8
PEP8
PEP8
Whitespace shrinking
Trim trailing whitespace
Whitespace fixes
Merge pull request #342 from dsnellgrove/pep8-1

More whitespace fixes