more code cleanup on screen scraper