JsonDiff: some code modifications