Refactor  a bit.
Refactor  a bit.

thehyve/heim-SmartR,thehyve/naa-SmartR,thehyve/heim-SmartR,agapow/smartr,thehyve/heim-SmartR,agapow/smartr,thehyve/naa-SmartR,thehyve/naa-SmartR,agapow/smartr,thehyve/heim-SmartR,agapow/smartr