Some more cleaning up of text