Get rid of some manual json string concatenation