Make labels better
On advice from JSHint
Merge remote-tracking branch 'origin/master' into hr-cmstrs

* origin/master:
  On advice from JSHint
  Make labels better