[WIP] Refactor duplicated code for better maintainability

[Copilot]

Thanks for asking me to work on this. I will get started on it and keep this PR's description up to date as I form a plan and make progress.

Original prompt

Find and refactor duplicated code

---

💬 We'd love your input! Share your thoughts on Copilot coding agent in our 2 minute survey.