cleaned up a few other areas and convert nokogiri doc to hash