minor edits of commenting