Clean up String to match new style
15 files changed