cleaned up wordcloud code

style upgrades, tests all work