Scraper2

Cleaned up the code a little