JSON: Refactorings