Comments cleanup (minor edits)