Fix flake8 errors.
Fix remaining flake8 errors.