Refactor to use external orcid-java-client