Fixed Flake8 issues #4204