Revert "Revert "working with strings and cleanup""

This reverts commit 94f5d68fb447709032ebbe838d0982377b49692e.