Scraping refactoring