Cleaned up some flake8 violations