minor pep8 removal
pep8 and merge @lowks pr
Merge branch 'lowks-master'