Rewrite "brut" formulas using new syntax and a period-agnostic declaration. Correct error message.
Refactor some intermediate variables for clarity