Move the comments into code to the body text. Some changes from PR #743