word-count: clean up by splitting more intelligently