Conform to the pep8 style guide

If the existing code conforms to pep8 as is, it will be much easier to ensure future contributions remain pep8 compliant.