Additional editor refactorings