More PEP8 work
Merge pull request #19 from gsong/george/more-pep8

More PEP8 work