Pep 8

Pep 8 mostly enforced