diff --git a/core/modules/field/modules/email_field/email_field.info b/core/modules/field/modules/email_field/email_field.info
index 3e5f6d1..000ba1b 100644
--- a/core/modules/field/modules/email_field/email_field.info
+++ b/core/modules/field/modules/email_field/email_field.info
@@ -1,5 +1,5 @@
 name = Email
-description = Defines a field type for email addresses
+description = Defines a field type for email addresses.
 package = Core
 version = VERSION
 core = 8.x
diff --git a/core/modules/field/modules/email_field/email_field.install b/core/modules/field/modules/email_field/email_field.install
index a7f6c9d..ad2fcbb 100644
--- a/core/modules/field/modules/email_field/email_field.install
+++ b/core/modules/field/modules/email_field/email_field.install
@@ -1,12 +1,23 @@
 <?php
 
 /**
+ * @file
+ * Install, update and uninstall functions for the email_field module.
+ */
+
+/**
  * Implements hook_field_schema().
  */
 function email_field_field_schema($field) {
   $columns = array(
     'value' => array(
       'type' => 'varchar',
+      // The maximum length of an e-mail address is 254 characters. RFC 3696
+      // specifies a total length of 320 characters, but mentions that
+      // addresses longer than 256 characters are not normally useful. Erratum
+      // 1690 was then released which corrected this value to 254 characters.
+      // @see http://tools.ietf.org/html/rfc3696#section-3
+      // @see http://www.rfc-editor.org/errata_search.php?rfc=3696&eid=1690
       'length' => 254,
       'not null' => FALSE,
     ),
diff --git a/core/modules/field/modules/email_field/email_field.module b/core/modules/field/modules/email_field/email_field.module
index afefb9c..08eca17 100644
--- a/core/modules/field/modules/email_field/email_field.module
+++ b/core/modules/field/modules/email_field/email_field.module
@@ -1,6 +1,11 @@
 <?php
 
 /**
+ * @file
+ * Defines a simple email field type.
+ */
+
+/**
  * Implements hook_field_info().
  */
 function email_field_field_info() {
@@ -8,8 +13,6 @@ function email_field_field_info() {
     'email' => array(
       'label' => t('Email'),
       'description' => t('This field stores an email address in the database.'),
-      'settings' => array(),
-      'instance_settings' => array(),
       'default_widget' => 'email_default',
       'default_formatter' => 'text_plain',
     ),
@@ -24,11 +27,6 @@ function email_field_field_widget_info() {
     'email_default' => array(
       'label' => t('Email'),
       'field types' => array('email'),
-      'settings' => array(),
-      'behaviors' => array(
-        'multiple values' => FIELD_BEHAVIOR_DEFAULT,
-        'default value' => FIELD_BEHAVIOR_DEFAULT,
-      ),
     ),
   );
 }
@@ -65,7 +63,7 @@ function email_field_field_formatter_info_alter(&$info) {
 function email_field_field_formatter_info() {
   return array(
     'email_mailto' => array(
-      'label' => t('Mailto Link'),
+      'label' => t('Mailto link'),
       'field types' => array('email'),
     ),
   );
@@ -80,7 +78,7 @@ function email_field_field_formatter_view($entity_type, $entity, $field, $instan
     $element[$delta] = array(
       '#type' => 'link',
       '#title' => $item['value'],
-      '#href' => 'mailto:' . $item['value']
+      '#href' => 'mailto:' . $item['value'],
     );
   }
   return $element;