Added option to remove stopwords only if wanted