More text cleanups