Refactoring JsonParser to remove JsonUtil