editor refactorings