Json Refactoring