Rejiggering scrape code