open-zwave: suggested improvements to formula