Wordcount cleanup