Cleaned up everything up till scraping