edit TODO tasks and refactor scraper code