diff --git a/core/modules/field_ui/field_ui.admin.inc b/core/modules/field_ui/field_ui.admin.inc
index bb99234..dd62818 100644
--- a/core/modules/field_ui/field_ui.admin.inc
+++ b/core/modules/field_ui/field_ui.admin.inc
@@ -247,7 +247,11 @@ function theme_field_ui_table($variables) {
     if (isset($region['message'])) {
       $class = (empty($region['rows_order']) ? 'region-empty' : 'region-populated');
       $table['rows'][] = array(
-        'class' => array('region-message', 'region-' . $region_name_class . '-message', $class),
+        'class' => array(
+          'region-message',
+          'region-' . $region_name_class . '-message',
+          $class,
+        ),
         'no_striping' => TRUE,
         'data' => array(
           array('data' => $region['message'], 'colspan' => $columns_count),
@@ -359,7 +363,7 @@ function field_ui_field_overview_form($form, &$form_state, $entity_type, $bundle
         '#default_value' => $instance['widget']['weight'],
         '#size' => 3,
         '#attributes' => array('class' => array('field-weight')),
-       ),
+      ),
       'parent_wrapper' => array(
         'parent' => array(
           '#type' => 'select',
@@ -468,7 +472,9 @@ function field_ui_field_overview_form($form, &$form_state, $entity_type, $bundle
   if ($field_type_options && $widget_type_options) {
     $name = '_add_new_field';
     $table[$name] = array(
-      '#attributes' => array('class' => array('draggable', 'tabledrag-leaf', 'add-new')),
+      '#attributes' => array(
+        'class' => array('draggable', 'tabledrag-leaf', 'add-new'),
+      ),
       '#row_type' => 'add_new_field',
       '#region_callback' => 'field_ui_field_overview_row_region',
       'label' => array(
@@ -477,7 +483,7 @@ function field_ui_field_overview_form($form, &$form_state, $entity_type, $bundle
         '#title_display' => 'invisible',
         '#size' => 15,
         '#description' => t('Label'),
-        '#prefix' => '<div class="label-input"><div class="add-new-placeholder">' . t('Add new field') .'</div>',
+        '#prefix' => '<div class="label-input"><div class="add-new-placeholder">' . t('Add new field') . '</div>',
         '#suffix' => '</div>',
       ),
       'weight' => array(
@@ -572,7 +578,9 @@ function field_ui_field_overview_form($form, &$form_state, $entity_type, $bundle
     asort($existing_field_options);
     $name = '_add_existing_field';
     $table[$name] = array(
-      '#attributes' => array('class' => array('draggable', 'tabledrag-leaf', 'add-new')),
+      '#attributes' => array(
+        'class' => array('draggable', 'tabledrag-leaf', 'add-new'),
+      ),
       '#row_type' => 'add_new_field',
       '#region_callback' => 'field_ui_field_overview_row_region',
       'label' => array(
@@ -582,7 +590,7 @@ function field_ui_field_overview_form($form, &$form_state, $entity_type, $bundle
         '#size' => 15,
         '#description' => t('Label'),
         '#attributes' => array('class' => array('label-textfield')),
-        '#prefix' => '<div class="label-input"><div class="add-new-placeholder">' . t('Re-use existing field') .'</div>',
+        '#prefix' => '<div class="label-input"><div class="add-new-placeholder">' . t('Re-use existing field') . '</div>',
         '#suffix' => '</div>',
       ),
       'weight' => array(
@@ -645,7 +653,11 @@ function field_ui_field_overview_form($form, &$form_state, $entity_type, $bundle
   // Add settings for the update selects behavior.
   $js_fields = array();
   foreach ($existing_fields as $field_name => $info) {
-    $js_fields[$field_name] = array('label' => $info['label'], 'type' => $info['type'], 'widget' => $info['widget_type']);
+    $js_fields[$field_name] = array(
+      'label' => $info['label'],
+      'type' => $info['type'],
+      'widget' => $info['widget_type'],
+    );
   }
 
   $form['#attached']['js'][] = array(
@@ -654,8 +666,20 @@ function field_ui_field_overview_form($form, &$form_state, $entity_type, $bundle
   );
 
   // Add tabledrag behavior.
-  $form['#attached']['drupal_add_tabledrag'][] = array('field-overview', 'order', 'sibling', 'field-weight');
-  $form['#attached']['drupal_add_tabledrag'][] = array('field-overview', 'match', 'parent', 'field-parent', 'field-parent', 'field-name');
+  $form['#attached']['drupal_add_tabledrag'][] = array(
+    'field-overview',
+    'order',
+    'sibling',
+    'field-weight',
+  );
+  $form['#attached']['drupal_add_tabledrag'][] = array(
+    'field-overview',
+    'match',
+    'parent',
+    'field-parent',
+    'field-parent',
+    'field-name',
+  );
 
   return $form;
 }
@@ -746,7 +770,7 @@ function _field_ui_field_overview_form_validate_add_existing($form, &$form_state
   if (isset($form_state['values']['fields']['_add_existing_field'])) {
     $field = $form_state['values']['fields']['_add_existing_field'];
 
-    // Validate if any information was provided in the 're-use existing field' row.
+    // Validate if information was provided in the 're-use existing field' row.
     if (array_filter(array($field['label'], $field['field_name'], $field['widget_type']))) {
       // Missing label.
       if (!$field['label']) {
@@ -944,7 +968,7 @@ function field_ui_display_overview_form($form, &$form_state, $entity_type, $bund
   $field_label_options = array(
     'above' => t('Above'),
     'inline' => t('Inline'),
-    'hidden' => t('<Hidden>'),
+    'hidden' => '<' . t('Hidden') . '>',
   );
   $extra_visibility_options = array(
     'visible' => t('Visible'),
@@ -1000,7 +1024,7 @@ function field_ui_display_overview_form($form, &$form_state, $entity_type, $bund
     );
 
     $formatter_options = field_ui_formatter_options($field['type']);
-    $formatter_options['hidden'] = t('<Hidden>');
+    $formatter_options['hidden'] = '<' . t('Hidden') . '>';
     $table[$name]['format'] = array(
       'type' => array(
         '#type' => 'select',
@@ -1015,7 +1039,6 @@ function field_ui_display_overview_form($form, &$form_state, $entity_type, $bund
     );
 
     // Formatter settings.
-
     // Check the currently selected formatter, and merge persisted values for
     // formatter settings.
     if (isset($form_state['values']['fields'][$name]['type'])) {
@@ -1084,7 +1107,9 @@ function field_ui_display_overview_form($form, &$form_state, $entity_type, $bund
               '#op' => 'cancel',
               // Do not check errors for the 'Cancel' button, but make sure we
               // get the value of the 'formatter type' select.
-              '#limit_validation_errors' => array(array('fields', $name, 'type')),
+              '#limit_validation_errors' => array(
+                array('fields', $name, 'type'),
+              ),
             ),
           ),
         );
@@ -1233,8 +1258,20 @@ function field_ui_display_overview_form($form, &$form_state, $entity_type, $bund
   $form['#attached']['library'][] = array('field_ui', 'drupal.field_ui');
 
   // Add tabledrag behavior.
-  $form['#attached']['drupal_add_tabledrag'][] = array('field-display-overview', 'order', 'sibling', 'field-weight');
-  $form['#attached']['drupal_add_tabledrag'][] = array('field-display-overview', 'match', 'parent', 'field-parent', 'field-parent', 'field-name');
+  $form['#attached']['drupal_add_tabledrag'][] = array(
+    'field-display-overview',
+    'order',
+    'sibling',
+    'field-weight',
+  );
+  $form['#attached']['drupal_add_tabledrag'][] = array(
+    'field-display-overview',
+    'match',
+    'parent',
+    'field-parent',
+    'field-parent',
+    'field-name',
+  );
 
   return $form;
 }
@@ -1545,7 +1582,6 @@ function field_ui_existing_field_options($entity_type, $bundle) {
           // - fields already in the current bundle,
           // - fields that cannot be added to the entity type,
           // - fields that that shoud not be added via user interface.
-
           if (empty($field['locked'])
             && !field_info_instance($entity_type, $field['field_name'], $bundle)
             && (empty($field['entity_types']) || in_array($entity_type, $field['entity_types']))
@@ -1960,7 +1996,7 @@ function field_ui_field_edit_form($form, &$form_state, $instance) {
   $form['actions'] = array('#type' => 'actions');
   $form['actions']['submit'] = array(
     '#type' => 'submit',
-    '#value' => t('Save settings')
+    '#value' => t('Save settings'),
   );
   $form['actions']['delete'] = array(
     '#type' => 'submit',