str cleanup
Merge pull request #430 from modilabs/joining-412

str cleanup