[pvr] some more cleanup and a few minor changes

@xhaggi @opdenkamp if you could take a look?

If you want to I could separate d7813fd
I removed because the method is only used once and is 90% duped code. I'll see if there's away to reduce the duping without dropping the whole method.