Rework score screen-scraping