cleaned up scraper/parser a bit more