More Text clean up