corrected wrong tfidf
merge conflict
removed some unnecessary lines