flake8 cleanup passes
Merge pull request #1 from joshfriend/cleanup

Clean up code