Fix Flake8 related errors

New version of Flake8, new errors :)

Fixes #7