More flake8 errors fixed