Minor json cleanup