Merge pull request #2 from ryansb/master

Separation of concerns
PEP8