PEP8 review
Merge pull request #1364 from bebef1987/pep8

PEP8 review