[WIP] pep8

OK, I added an issue (#186) and I'll do this on a different pull request.