Flake8 errors fixed