Fixed flake8 issues #4203