Pull out scraping components into separate methods