PEP8 cleanup
More PEP8 work
Merge pull request #16 from gsong/george/code-review

George/code review