Refactoring of some JSONS