StreetScraper refactor