tidied up scraping operations a bit