Minor refactoring of power management classes

I took a look at PM code and this little refactoring made sense.
Tested on Debian testing.