Taking out pep8 violations
Merge pull request #2 from lowks/master

Taking out pep8 violations