Simplify change code