Cosmetic changes to formatting and comments.