refactored wordcloud