cleaned up wordcloud code

style upgrades, tests all work
these should be variables, so it is possible to change them from one place: i'm wondering what was the reasoning when you removed from the model