[569] Refactor to tidy up the code and make the scraper re-usable