Make as much `pep8` compliant as possible

As part of http://24pullrequests.com/