Improve comments and layout.