Merge "fix flake8 errors"