orcid_model - small refactor