[SD-714][SD-718] Fixing flake8 errors.