Upgrades to the tidy logic to clean more word paste mess.