formatting entity
cleaning up entity