Clean up some wording