refactoring and began work on index scraper