Began fixing flake8 errors