[FOLLOWUP][TASK] Streamline tbe_editor code