Cleaned up EquationConverter