Issue #43: additional pep8 compliance

Just a few things I missed, plus some new ones from the 3 most recent commits.