Moved scraping logic to separate module