Improve comments and format.