flake8 and entity string changes
flake8 and entity string changes