Improve comments and address nits.