cleaned up wordcloud code

style upgrades, tests all work
i guess this is size, isn't it too big?