Improve WordCase function and clean up more data.