Fixed various pep8 errors
Merge pull request #82 from trobert2/test_refactor6

Fixed various pep8 errors