cleaning up to be more pep8 compliant, still not perfect
Merge branch 'issue-1'- Alex