Refactor to use Rop

[ElectNewt]

I started to use rop as an example in the code, it should be quite consistent the way is it done

or maybe not for clarity if someone else is checking the code; think about it.