More cleanup of text