Refactoring of some JSONS

same as above