US52: TA151: General re-factoring of strings and scopings