Minor cleanup to Entity