Fix various PEP8 violations
Merge pull request #221 from phihag/fix-pep8-violations

Fix various PEP8 violations