Minor cleanup, mostly whitespace and comment editing.