remove some diff noise
Shortened the JSON creation a bit; other minor refactorings