Minor refactoring

[nulltoken]

Pull request description

Reduce some code duplication

PR meta checklist

• [X] Pull request is targeted at main branch for code
• [ ] Pull request is linked to all related issues, if any.

Code PR specific checklist

• [ ] My code follows the code style of this project and AspNetCore coding guidelines.
• [ ] My change requires a change to the documentation.
  • [ ] I have updated the documentation accordingly.
• [ ] I have updated the appropriate sub section in the CHANGELOG.md.
• [ ] I have added, updated or removed tests to according to my changes.
  • [X] All tests passed.