Rework of WordCount after feedback from @etrepum.