Update comments based on Duncan's feedback.