diff --git a/attributemap/facebook2name.php b/attributemap/facebook2name.php
index eb3f7a1655da6fc78f708d071e62620b3e9a9712..5867ea7edfc87e56c1338bcb99b06f4bcc98f035 100644
--- a/attributemap/facebook2name.php
+++ b/attributemap/facebook2name.php
@@ -1,21 +1,18 @@
 <?php
 $attributemap = array(
 
-	// Generated Facebook Attributes
-	'facebook_user'			=>	'eduPersonPrincipalName', // username OR uid @ facebook.com
-	'facebook_targetedID'		=>	'eduPersonTargetedID', // http://facebook.com!uid
-	'facebook_cn'			=>	'cn', // duplicate of displayName
+    // Generated Facebook Attributes
+    'facebook_user'        => 'eduPersonPrincipalName', // username OR uid @ facebook.com
+    'facebook_targetedID'  => 'eduPersonTargetedID', // http://facebook.com!uid
+    'facebook_cn'          => 'cn', // duplicate of displayName
 
-	// Attributes Returned by Facebook
-	'facebook.first_name'		=>	'givenName',
-	'facebook.last_name'		=>	'sn',
-	'facebook.name'			=>	'displayName', // or 'cn'
-	'facebook.email'		=>	'mail',
-	//'facebook.pic'			=>	'jpegPhoto', // URL not image data
-	//'facebook.pic_square'			=>	'jpegPhoto', // URL not image data
-	'facebook.username'		=>	'uid', // facebook username (maybe blank)
-	//'facebook.uid'		=>	'uid', // numeric facebook user id
-	'facebook.profile_url'		=>	'labeledURI',
-	'facebook.locale'		=>	'preferredLanguage',
-	'facebook.about_me'		=>	'description',
+    // Attributes Returned by Facebook
+    'facebook.first_name'  => 'givenName',
+    'facebook.last_name'   => 'sn',
+    'facebook.name'        => 'displayName', // or 'cn'
+    'facebook.email'       => 'mail',
+    'facebook.username'    => 'uid', // facebook username (maybe blank)
+    'facebook.profile_url' => 'labeledURI',
+    'facebook.locale'      => 'preferredLanguage',
+    'facebook.about_me'    => 'description',
 );
diff --git a/attributemap/linkedin2name.php b/attributemap/linkedin2name.php
index 0d3a43303daff05ad18b6334b4ab11c7b4fad1b4..97231dd4b37f63d09c697e8f41e9da769f5542ed 100644
--- a/attributemap/linkedin2name.php
+++ b/attributemap/linkedin2name.php
@@ -1,19 +1,18 @@
 <?php
 $attributemap = array(
 
-	// See http://developer.linkedin.com/docs/DOC-1061 for LinkedIn Profile fields.
-	// NB: JSON response requires the conversion of field names from hyphened to camelCase.
-	// For instance, first-name becomes firstName.
+    // See http://developer.linkedin.com/docs/DOC-1061 for LinkedIn Profile fields.
+    // NB: JSON response requires the conversion of field names from hyphened to camelCase.
+    // For instance, first-name becomes firstName.
 
-	// Generated LinkedIn Attributes
-	'linkedin_user'			=>	'eduPersonPrincipalName', // id  @ linkedin.com
-	'linkedin_targetedID'		=>	'eduPersonTargetedID', // http://linkedin.com!id
+    // Generated LinkedIn Attributes
+    'linkedin_user'       => 'eduPersonPrincipalName', // id  @ linkedin.com
+    'linkedin_targetedID' => 'eduPersonTargetedID', // http://linkedin.com!id
 
-	// Attributes Returned by LinkedIn
-	'linkedin.firstName'		=>	'givenName',
-	'linkedin.lastName'		=>	'sn',
-	'linkedin.id'			=>	'uid', // alpha + mixed case user id
-	//'linkedin.pictureUrl'		=>	'jpegPhoto', // URL not image data
-	'linkedin.headline'		=>	'title',
-	'linkedin.summary'		=>	'description',
+    // Attributes Returned by LinkedIn
+    'linkedin.firstName'  => 'givenName',
+    'linkedin.lastName'   => 'sn',
+    'linkedin.id'         => 'uid', // alpha + mixed case user id
+    'linkedin.headline'   => 'title',
+    'linkedin.summary'    => 'description',
 );
diff --git a/attributemap/myspace2name.php b/attributemap/myspace2name.php
index dbc52d4b8556ed639bb1f4bcff5edf5d6904f5e7..6111f61d051d84713edc412f2fba8e2183091b00 100644
--- a/attributemap/myspace2name.php
+++ b/attributemap/myspace2name.php
@@ -1,18 +1,16 @@
 <?php
 $attributemap = array(
 
-	// See http://developerwiki.myspace.com/index.php?title=People_API for attributes
+    // See http://developerwiki.myspace.com/index.php?title=People_API for attributes
 
-	// Generated MySpace Attributes
-	'myspace_user'			=>	'eduPersonPrincipalName', // username OR uid @ myspace.com
-	'myspace_targetedID'		=>	'eduPersonTargetedID', // http://myspace.com!uid
-	'myspace_username'		=>	'uid', // myspace username (maybe numeric uid)
-	//'myspace_uid'			=>	'uid', // numeric myspace user id
+    // Generated MySpace Attributes
+    'myspace_user'            => 'eduPersonPrincipalName', // username OR uid @ myspace.com
+    'myspace_targetedID'      => 'eduPersonTargetedID', // http://myspace.com!uid
+    'myspace_username'        => 'uid', // myspace username (maybe numeric uid)
 
-	// Attributes Returned by MySpace
-	'myspace.name.givenName'	=>	'givenName',
-	'myspace.name.familyName'	=>	'sn',
-	'myspace.displayName'		=>	'displayName',
-	//'myspace.thumbnailUrl'	=>	'jpegPhoto', // URL not image data
-	'myspace.profileUrl'		=>	'labeledURI',
+    // Attributes Returned by MySpace
+    'myspace.name.givenName'  => 'givenName',
+    'myspace.name.familyName' => 'sn',
+    'myspace.displayName'     => 'displayName',
+    'myspace.profileUrl'      => 'labeledURI',
 );
diff --git a/attributemap/twitter2name.php b/attributemap/twitter2name.php
index 605b5613e6fd210f8884a5d81eedec550e7e311d..27c9e755a1b478625846a20c6000ea173ae7ee7d 100644
--- a/attributemap/twitter2name.php
+++ b/attributemap/twitter2name.php
@@ -1,17 +1,14 @@
 <?php
 $attributemap = array(
 
-	// Generated Twitter Attributes
-	'twitter_screen_n_realm'	=>	'eduPersonPrincipalName', // screen_name@twitter.com
-	//'twitter_at_screen_name'	=>	'eduPersonPrincipalName', // legacy @twitter format
-	'twitter_targetedID'		=>	'eduPersonTargetedID', // http://twitter.com!id_str
+    // Generated Twitter Attributes
+    'twitter_screen_n_realm' => 'eduPersonPrincipalName', // screen_name@twitter.com
+    'twitter_targetedID'     => 'eduPersonTargetedID', // http://twitter.com!id_str
 
-	// Attributes Returned by Twitter
-	'twitter.screen_name'		=>	'uid', // equivalent to twitter username without leading @
-	//'twitter.id_str'		=>	'uid', // persistent numeric twitter user id
-	'twitter.name'			=>	'displayName',
-	'twitter.url'			=>	'labeledURI',
-	'twitter.lang'			=>	'preferredLanguage',
-	//'twitter.profile_image_url'	=>	'jpegPhoto',
-	'twitter.description'		=>	'description',
+    // Attributes Returned by Twitter
+    'twitter.screen_name'    => 'uid', // equivalent to twitter username without leading @
+    'twitter.name'           => 'displayName',
+    'twitter.url'            => 'labeledURI',
+    'twitter.lang'           => 'preferredLanguage',
+    'twitter.description'    => 'description',
 );
diff --git a/attributemap/windowslive2name.php b/attributemap/windowslive2name.php
index f43d0f99a099e232dc08120dbadb2dcf4f879bfb..e0821f16df8ac36fbc3cf4879c0eddc6ce889fff 100644
--- a/attributemap/windowslive2name.php
+++ b/attributemap/windowslive2name.php
@@ -1,16 +1,14 @@
 <?php
 $attributemap = array(
 
-	// Generated Windows Live ID Attributes
-	'windowslive_user'		=>	'eduPersonPrincipalName', // uid @ windowslive.com
-	'windowslive_targetedID'	=>	'eduPersonTargetedID', // http://windowslive.com!uid
-	'windowslive_uid'		=>	'uid', // windows live id
-	'windowslive_mail'		=>	'mail',
-
-	// Attributes Returned by Windows Live ID
-	'windowslive.FirstName'		=>	'givenName',
-	'windowslive.LastName'		=>	'sn',
-	'windowslive.Location'		=>	'l',
-	//'windowslive.ThumbnailImageLink'=>	'jpegPhoto', // URL not image data
+    // Generated Windows Live ID Attributes
+    'windowslive_user'       => 'eduPersonPrincipalName', // uid @ windowslive.com
+    'windowslive_targetedID' => 'eduPersonTargetedID', // http://windowslive.com!uid
+    'windowslive_uid'        => 'uid', // windows live id
+    'windowslive_mail'       => 'mail',
+    // Attributes Returned by Windows Live ID
+    'windowslive.FirstName'  => 'givenName',
+    'windowslive.LastName'   => 'sn',
+    'windowslive.Location'   => 'l',
 
 );