Minor refactorings in scraper