Fixed #111 -- Cleaned up PEP8 violations.

The autopep8 run may have messed around with lines that were too long,
so some manual fixing may be required.