Existing UserVariable handling + tests
Refactor InternFormula