Fix lint

This should fix all accumulated flake8 lint