Changes in formatting and comments.