[SATYR PATCH 3/8] Minor json parsing refactorization