refactoring to fix a couple codacy issues

[jasoncalabrese]

No description provided.

[codecov-io]

Current coverage is 83.77%

Merging #746 into dev will not affect coverage as of 79e2e0f

@@              dev    #746   diff @@
=====================================
  Files          46      46       
  Stmts        2409    2415     +6
  Branches      489     489       
  Methods       364     364       
=====================================
+ Hit          2018    2023     +5
  Partial        17      17       
- Missed        374     375     +1

Review entire Coverage Diff

---

Uncovered Suggestions

1. +0.58% via lib/mqtt.js#128...141
2. +0.50% via lib/utils.js#31...42
3. +0.50% via lib/mqtt.js#292...303
4. See 7 more...

Powered by Codecov