Minor cleanup and comments.