more refactorings of the editor package