Church29 pep8editing2

Solves the readability issue + some additional goodies