Updated comment structure