Simplify 4p(q-1)+q(1-p)