Tiding up the Entity class.