Minor refactoring in parallel fetcher