More cleanups of text