Refactoring to extract duplicate logic as a separate method