Minor WordCount Refactor