Verbiage and logging cleanup.