Fixed up scraper to (hopefully) make it more resilient to website changes

Also, cleaned up the code just a little bit.