Revert "A couple of string adjustments"

This reverts commit 6a05e8e63c5b04b4d1323c8acc6e146afcd7a592.