Updated wordcloud generation