More text cleanup work