Improve and simplify PlusMinus & MinusPlus