Clarified comments and IDs