Merge pull request #1343 from vlakoff/string

Improvements to Str::words
Cleaning up some code.
Cleaning up some code.