Further decompose Scraper methods
Clean up Nokogiri calls and fix method calls