Fixed JSON formatting some more