[Entity] Code review