remove some duplication when formatting messages

[jasoncalabrese]

No description provided.

[codecov-io]

Current coverage is 76.08%

Merging #669 into dev will change coverage by +0.29% by 70774f6

Coverage Diff

@@              dev    #669   diff @@
=====================================
  Files          45      45       
  Stmts        2193    2170    -23
  Branches      428     408    -20
  Methods       291     295     +4
=====================================
- Hit          1662    1651    -11
  Partial        12      12       
+ Missed        519     507    -12

---

Uncovered Suggestions

1. +0.60% via lib/treatments.js#18...30
2. +0.56% via lib/utils.js#29...40
3. +0.56% via lib/mqtt.js#157...168
4. See 7 more...

Powered by Codecov