More string cleanups