Simplify (x^2+y^2x+z)-(-x+xy^2-z)