Refactor, Redesign: SubtractExpression removed, replaced by BinaryArithmeticExpression with subtract operator