Cleaned up entity classification