FormulaEditor refactored