only pep8 and very light idiomatic changes
Merge pull request #2 from disruptek/pep8

only pep8 and very light idiomatic changes