tweaking some stuff
remove nokogiri for its one use