pep 8ed except for method names
Merge pull request #1 from wegry/master

pep 8ed except for method names