Making the entity extraction function cleaner Co-authored-by: Soumil Rathi <soumilrathi@gmail.com>
None