diff --git a/core/lib/Drupal/Core/Field/FieldItemBase.php b/core/lib/Drupal/Core/Field/FieldItemBase.php
index 7c36b80..08b2f59 100644
--- a/core/lib/Drupal/Core/Field/FieldItemBase.php
+++ b/core/lib/Drupal/Core/Field/FieldItemBase.php
@@ -217,4 +217,5 @@ public function deleteRevision() { }
   public function getMainPropertyName() {
     return 'value';
   }
+
 }
diff --git a/core/lib/Drupal/Core/Field/FieldItemInterface.php b/core/lib/Drupal/Core/Field/FieldItemInterface.php
index 4a2ecc2..2cdd0c3 100644
--- a/core/lib/Drupal/Core/Field/FieldItemInterface.php
+++ b/core/lib/Drupal/Core/Field/FieldItemInterface.php
@@ -15,9 +15,8 @@
  * Entity field items are typed data objects containing the field values, i.e.
  * implementing the ComplexDataInterface.
  *
- * When implementing this interface which extends Traversable, make sure to
- * list IteratorAggregate or Iterator before this interface in the implements
- * clause.
+ * When implementing this interface which extends Traversable, make sure to list
+ * IteratorAggregate or Iterator before this interface in the implements clause.
  *
  * @see \Drupal\Core\Field\FieldItemListInterface
  * @see \Drupal\Core\Field\FieldItemBase
@@ -123,8 +122,8 @@ public function update();
   /**
    * Defines custom delete behavior for field values.
    *
-   * This method is called during the process of deleting an entity, just
-   * before values are deleted from storage.
+   * This method is called during the process of deleting an entity, just before
+   * values are deleted from storage.
    */
   public function delete();
 
@@ -132,8 +131,8 @@ public function delete();
    * Defines custom revision delete behavior for field values.
    *
    * This method is called from during the process of deleting an entity
-   * revision, just before the field values are deleted from storage. It is
-   * only called for entity types that support revisioning.
+   * revision, just before the field values are deleted from storage. It is only
+   * called for entity types that support revisioning.
    */
   public function deleteRevision();
 
@@ -149,6 +148,8 @@ public function deleteRevision();
    *
    * @todo: Move this to ComplexDataInterface once we improved Typed data to do
    *   not enforce having all methods on the data objects.
+   *   https://drupal.org/node/2002134
    */
   public function getMainPropertyName();
+
 }
diff --git a/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/EntityReferenceItem.php b/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/EntityReferenceItem.php
index c04a6fa..655f4fd 100644
--- a/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/EntityReferenceItem.php
+++ b/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/EntityReferenceItem.php
@@ -148,4 +148,5 @@ public function onChange($property_name) {
   public function getMainPropertyName() {
     return 'target_id';
   }
+
 }
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/Field/FieldType/TaxonomyTermReferenceItem.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/Field/FieldType/TaxonomyTermReferenceItem.php
index 097e307..fb0e537 100644
--- a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/Field/FieldType/TaxonomyTermReferenceItem.php
+++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/Field/FieldType/TaxonomyTermReferenceItem.php
@@ -152,8 +152,9 @@ public function instanceSettingsForm(array $form, array &$form_state) {
   /**
   * Flattens an array of allowed values.
   *
-  * @todo: define this function somewhere else, so we don't have to redefine it
+  * @todo Define this function somewhere else, so we don't have to redefine it
   *   when other field type classes, e.g. list option, need it too.
+  *   https://drupal.org/node/2138803
   *
   * @param array $array
   *   A single or multidimensional array.