Updates to pass some flake8 code checks.