Getting rid of rank all together (it can always be computed from scraped data). Also added optional wrapper for team goals scraping to make code clearer and get rid of ugly null check