Some cleanups of text