diff --git a/core/lib/Drupal/Core/Config/Metadata/ConfigWrapper.php b/core/lib/Drupal/Core/Config/Metadata/ConfigWrapper.php
index b38f72a..3ff15a7 100644
--- a/core/lib/Drupal/Core/Config/Metadata/ConfigWrapper.php
+++ b/core/lib/Drupal/Core/Config/Metadata/ConfigWrapper.php
@@ -177,8 +177,8 @@ public function get($property_name) {
    * Implements Drupal\Core\TypedData\ComplexDataInterface::set().
    */
   public function set($property_name, $value) {
-    // Set the data into the configuration array but behave according
-    // to the interface specification when we've got a null value.
+    // Set the data into the configuration array but behave according to the
+    // interface specification when we've got a null value.
     if (isset($value)) {
       $this->setElementData($property_name, $value);
       return $this->get($property_name);
diff --git a/core/lib/Drupal/Core/Config/Metadata/MetadataLookup.php b/core/lib/Drupal/Core/Config/Metadata/MetadataLookup.php
index 049ecb1..48ac596 100644
--- a/core/lib/Drupal/Core/Config/Metadata/MetadataLookup.php
+++ b/core/lib/Drupal/Core/Config/Metadata/MetadataLookup.php
@@ -108,4 +108,5 @@ protected function readMetadata($name) {
     }
     return array();
   }
+
 }
diff --git a/core/lib/Drupal/Core/Config/Metadata/MetadataStorage.php b/core/lib/Drupal/Core/Config/Metadata/MetadataStorage.php
index 927793a..0776f18 100644
--- a/core/lib/Drupal/Core/Config/Metadata/MetadataStorage.php
+++ b/core/lib/Drupal/Core/Config/Metadata/MetadataStorage.php
@@ -68,7 +68,7 @@ public function listAll($prefix = '') {
    * Returns a map of all metadata names and the module they belong to.
    *
    * @return array
-   *   Array mapping metadata names with module names,
+   *   An array mapping metadata names with module names.
    */
   protected function getMetadataMap() {
     if (!isset($this->metaMap)) {
diff --git a/core/lib/Drupal/Core/Config/Metadata/NestedElement.php b/core/lib/Drupal/Core/Config/Metadata/NestedElement.php
index 17abbab..4312cd4 100644
--- a/core/lib/Drupal/Core/Config/Metadata/NestedElement.php
+++ b/core/lib/Drupal/Core/Config/Metadata/NestedElement.php
@@ -159,7 +159,7 @@ public function getName() {
   }
 
   /**
-   * Implements Drupal\Core\TypedData\ContextAwareInterface::getName().
+   * Implements Drupal\Core\TypedData\ContextAwareInterface::setName().
    */
   public function setName($name) {
     $this->key = $name;
diff --git a/core/lib/Drupal/Core/Config/Metadata/WrapperBase.php b/core/lib/Drupal/Core/Config/Metadata/WrapperBase.php
index adc65cd..5ec8803 100644
--- a/core/lib/Drupal/Core/Config/Metadata/WrapperBase.php
+++ b/core/lib/Drupal/Core/Config/Metadata/WrapperBase.php
@@ -37,7 +37,7 @@
    * @param string $key
    *   Configuration key.
    *
-   * @result Drupal\Core\TypedData\TypedDataInterface
+   * @return Drupal\Core\TypedData\TypedDataInterface
    *   A TypedDataInterface object containing the configuration value.
    */
   protected function buildElement($key) {
@@ -45,8 +45,8 @@ protected function buildElement($key) {
     $definition = $this->getElementDefinition($key);
     $value = $this->getElementData($key);
     // If this is an end property, the value will be the configuration data.
-    // If it is a NestedElement, it won't be set, but retrieved from
-    // the parent element. See NestedElement::setValue()
+    // If it is a NestedElement, it won't be set, but retrieved from the parent
+    // element. See NestedElement::setValue()
     $context = array('name' => $key, 'parent' => $this);
     return typed_data()->create($definition, $value, $context);
   }
@@ -157,7 +157,7 @@ protected function buildDefinition($data, $metadata) {
    * Gets valid configuration data keys.
    *
    * @return array
-   *   Array valid configuration data keys.
+   *   Array of valid configuration data keys.
    */
   protected function getAllKeys() {
     return is_array($this->data) ? array_keys($this->data) : array();
@@ -186,7 +186,7 @@ public function getLabel() {
   }
 
   /**
-   * Implements Drupal\Core\Config\Metadata\WrapperInterface::getTranslatedData()
+   * Implements Drupal\Core\Config\Metadata\WrapperInterface::getTranslatedData().
    */
   public function getTranslatedData($langcode, $strict) {
     $translation = array();
@@ -210,7 +210,7 @@ public function getTranslatedData($langcode, $strict) {
   }
 
   /**
-   * Implements Drupal\Core\Config\Metadata\WrapperInterface::getElement()
+   * Implements Drupal\Core\Config\Metadata\WrapperInterface::getElement().
    */
   public function getElement($key) {
     $parts = explode('.', $key);
@@ -232,7 +232,7 @@ public function getElement($key) {
   }
 
   /**
-   * Implements Drupal\Core\Config\Metadata\WrapperInterface::setElementData()
+   * Implements Drupal\Core\Config\Metadata\WrapperInterface::setElementData().
    */
   public function setElementData($key, $value) {
     $parts = explode('.', $key);
diff --git a/core/lib/Drupal/Core/Config/Metadata/WrapperInterface.php b/core/lib/Drupal/Core/Config/Metadata/WrapperInterface.php
index c86adc5..5668056 100644
--- a/core/lib/Drupal/Core/Config/Metadata/WrapperInterface.php
+++ b/core/lib/Drupal/Core/Config/Metadata/WrapperInterface.php
@@ -141,7 +141,7 @@ public function getElementLabel($key);
    *   Key from the configuration data array.
    *
    * @return array
-   *   The metadata for the element, defaults to empty array().
+   *   The metadata for the element, defaults to an empty array.
    */
   public function getElementMetadata($key);
 
@@ -151,11 +151,11 @@ public function getElementMetadata($key);
    * The element definition is an array that may contain any of the following
    * optional elements:
    * - 'label', Human readable name for the element.
-   * - 'elements.name', Configuration name for each of the nested elements,
-   *   may contain the placeholder '%' to replace by the element's key.
-   * - 'elements.key', Name of the configuration data property to be used as
-   *   the key for name replacement. It may contain the placeholder '%'
-   *   to be replaced by the element's key.
+   * - 'elements.name', Configuration name for each of the nested elements, may
+   *   contain the placeholder '%' to replace by the element's key.
+   * - 'elements.key', Name of the configuration data property to be used as the
+   *   key for name replacement. It may contain the placeholder '%' to be
+   *   replaced by the element's key.
    * - 'elements.label', Name of the configuration data property to be used as
    *   the label for the element definition. It may contain the placeholder '%'
    *   to be replaced by the element's key.
@@ -166,7 +166,7 @@ public function getElementMetadata($key);
    *   Key from the configuration data array.
    *
    * @return array
-   *   The definition for the element, defaults to empty array().
+   *   The definition for the element, defaults to an empty array.
    */
   public function getElementDefinition($key);