[TASK] Further refactoring of Editor responsibilities