refactore: Extract duplicate logic into a new method and use it in "_…

refactore: Extract duplicate logic into a new method and use it in "_… #2906