Code tidy
Merge pull request #1477 from cdjackson/zwave-battery-converter

[Z-Wave] Code tidy