WordCount Refactor