Refactor citi scraper