Minor cleanup and comment clarifications.