Flake8 Fixes

This change makes flake8 (mostly) happy.