Small string cleanups