refactor P&DZ OP

I forgot to commit it