Pep8

Cleanup the Python code to be PEP-8 compliant.