Fix DEdge type, code cleanup