diff --git a/lib/AccountManager/Account.pm b/lib/AccountManager/Account.pm
index dbd4fc561782bc0c8f7ed4690eff80223e28e175..7417165676397a77058ea4e0a302833ef92f6221 100644
--- a/lib/AccountManager/Account.pm
+++ b/lib/AccountManager/Account.pm
@@ -78,36 +78,16 @@ my %scopedAffiliation = (
 );
 
 my %comment = (
-    alumni1         => <<EOF,
-Value "member" is not set for eduPersonAffiliation, contrary to current students.
-EOF
-    employee1      => <<EOF,
-There are conflicting definitions of "staff" and "employee" from country to country that make those values particularly unreliable in any international context. However in this example we set both values.
-EOF
-    fullset1       => <<EOF,
-This user profile respresents a researcher with all eduGAIN user attributes plus givenName and surname.
-EOF
-    generic1       => <<EOF,
-This account provides a limited set of user attributes (eduPersonPrincipalName, mail and displayName).
-EOF
-    librarywalkin1 => <<EOF,
-This term was created to cover the case where physical presence in a library facility grants someone access to electronic resources typically licensed for faculty, staff and students. In recent years the library walk-in provision has been extended to cover other cases such as library users on the campus network, or those using on-campus workstations.  Licensed resource providers have often been willing to interpret their contracts with licensees to accept this broader definition of "library-walk-in," though specific terms may vary. For a more direct way of using eduPerson attributes to express library privilege information, see the eduPersonEntitlement value "urn:mace:dir:entitlement:common-lib-terms" as defined in the MACE-Dir Registry of eduPersonEntitlement values <a href="http://middleware.internet2.edu/urn-mace/urn-mace-dir-entitlement.html">http://middleware.internet2.edu/urn-mace/urn-mace-dir-entitlement.html</a>.
-EOF
-    researcher1    => <<EOF,
-This account provides only an eduPersonTargetedID attribute.
-EOF
-    student1       => <<EOF,
-An active student has both "member" and "student" values set for eduPersonAffiliation.
-EOF
-    student2       => <<EOF,
-A PhD student, having three values set for eduPersonAffiliation: "member" and "student" and "faculty".
-EOF
-    teacher1       => <<EOF,
-This account provides a limited set of user attributes (eduPersonScopedAffiliation and eduPersonTargetedID).
-EOF
-    teacher2       => <<EOF,
-An active teacher has both "member" and "faculty" values set for eduPersonAffiliation.
-EOF
+    alumni1        => 'An ex-student with "alum" value for eduPersonAffiliation.',
+    employee1      => 'A person with "member", "staff" and "employee" values for eduPersonAffiliation.',
+    fullset1       => 'A person with all eduGAIN user attributes plus givenName and surname.',
+    generic1       => 'A person with a limited set of attributes (eduPersonPrincipalName, mail and displayName).',
+    librarywalkin1 => 'A library user on the campus network.',
+    researcher1    => 'A researcher with only an eduPersonTargetedID attribute.',
+    student1       => 'A student with "member" and "student" values for eduPersonAffiliation.',
+    student2       => 'A PhD student with "member", "student" and "faculty" values for eduPersonAffiliation.',
+    teacher1       => 'A teacher with a limited set of attributes (eduPersonScopedAffiliation and eduPersonTargetedID).',
+    teacher2       => 'A teacher with "member" and "faculty" values for eduPersonAffiliation.',
 );
 
 sub print {