Code cleanup and refactoring after switch to json

[tomburke-rse]

There seems like a lot of code repetition in this else block. Can we just always populate the labelSets like above, and then populate labelMapping if the labels are not Integers?

Originally posted by @gselzer in #3 (comment)