Pass flake8 linting

Includes changes for #1, too, with the intention that that change would be accepted first. I can change that if you want.