refactoring scrape components