reduced size/complexity of scraper, and changed naming convention in models