Updated to find words rather than split non-words