Editor refactor