String method cleanup.
5 files changed