Further refinement to editor