pep8 compliance and cleanup
Merge pull request #1 from ppinette/pep8_cleanup

pep8 compliance and cleanup