cleanup, and pep8 fixes
Merge pull request #244 from stevendgonzales/master

Minor cleanup & Fix Hopper Pep8