Cleanup and re-wording