More progress on refactoring
Merge pull request #1 from BFriedland/refactoring

More progress on refactoring for PEP8