Minor flake8 cleanup

This is a minor commit that performs a few flake8 cleanup changes.