cleaned up entitty quite a bit