Enable the set of Battery report

And some more code cleanup/consistency