more code cleanup in Entity.hs