re-introduce flake8 errors to cleanup diff