Fix the build with flake8 compliance