a few adjustments
decoupled "formula" and "solved formula"