Organize the comment structure