[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