add some code cleanup and skipping stopwords