diff --git a/core/includes/form.inc b/core/includes/form.inc
index 6c4fbe3..fcf762b 100644
--- a/core/includes/form.inc
+++ b/core/includes/form.inc
@@ -4920,7 +4920,8 @@ function _form_set_attributes(&$element, $class = array()) {
  *   $context['message'] = check_plain($node->label());
  * }
  *
- * // More advanced example: multi-step operation - load all rows, five by five
+ * // A more advanced example is a multi-step operation that loads all rows,
+ * // five by five.
  * function my_function_2(&$context) {
  *   if (empty($context['sandbox'])) {
  *     $context['sandbox']['progress'] = 0;
diff --git a/core/lib/Drupal/Core/Entity/DatabaseStorageControllerNG.php b/core/lib/Drupal/Core/Entity/DatabaseStorageControllerNG.php
index 442d540..c9d87dd 100644
--- a/core/lib/Drupal/Core/Entity/DatabaseStorageControllerNG.php
+++ b/core/lib/Drupal/Core/Entity/DatabaseStorageControllerNG.php
@@ -153,7 +153,7 @@ protected function buildPropertyQuery(QueryInterface $entity_query, array $value
   }
 
   /**
-   * Overrides \Drupal\Core\Entity\DatabaseStorageController::buildQuery().
+   * {@inheritdoc}
    */
   protected function buildQuery($ids, $revision_id = FALSE) {
     $query = db_select($this->entityInfo['base_table'], 'base');
@@ -428,7 +428,7 @@ protected function saveRevision(EntityInterface $entity) {
     $default_langcode = $entity->language()->langcode;
 
     if (!$entity->isNewRevision()) {
-      // Delete and insert to handle added/removed values.
+      // Delete to handle removed values.
       db_delete($this->revisionTable)
         ->condition($this->idKey, $entity->id())
         ->condition($this->revisionKey, $entity->getRevisionId())
diff --git a/core/modules/node/lib/Drupal/node/NodeStorageController.php b/core/modules/node/lib/Drupal/node/NodeStorageController.php
index 2d2e3e7..db3ba75 100644
--- a/core/modules/node/lib/Drupal/node/NodeStorageController.php
+++ b/core/modules/node/lib/Drupal/node/NodeStorageController.php
@@ -114,7 +114,7 @@ protected function invokeHook($hook, EntityInterface $node) {
   }
 
   /**
-   * Overrides \Drupal\Core\Entity\DatabaseStorageControllerNG::mapToDataStorageRecord().
+   * {@inheritdoc}
    */
   protected function mapToDataStorageRecord(EntityInterface $entity, $langcode) {
     // @todo Remove this once comment is a regular entity field.
diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/field/Link.php b/core/modules/node/lib/Drupal/node/Plugin/views/field/Link.php
index 1cb4e1f..266bedf 100644
--- a/core/modules/node/lib/Drupal/node/Plugin/views/field/Link.php
+++ b/core/modules/node/lib/Drupal/node/Plugin/views/field/Link.php
@@ -39,7 +39,7 @@ public function buildOptionsForm(&$form, &$form_state) {
   }
 
   /**
-   * Overrides \Drupal\views\Plugin\views\field\FieldPluginBase::query().
+   * {@inheritdoc}
    */
   public function query() {
     $this->add_additional_fields();
diff --git a/core/modules/node/node.install b/core/modules/node/node.install
index 23d3e8a..00172ce 100644
--- a/core/modules/node/node.install
+++ b/core/modules/node/node.install
@@ -895,7 +895,7 @@ function node_update_8016(&$sandbox) {
     foreach ($fields as $field) {
       db_drop_field('node', $field);
     }
-    // TODO Handle foreign keys.
+    // @todo Handle foreign keys.
   }
 }
 
diff --git a/core/modules/node/node.module b/core/modules/node/node.module
index 66fbaf5..043091b 100644
--- a/core/modules/node/node.module
+++ b/core/modules/node/node.module
@@ -1842,11 +1842,11 @@ function node_page_title(EntityInterface $node) {
  *
  * @param $nid
  *   The ID of a node.
- * @param $langcode
+ * @param string $langcode
  *   (optional) The language the node has been last modified in. Defaults to the
  *   node language.
  *
- * @return
+ * @return string
  *   A unix timestamp indicating the last time the node was changed.
  */
 function node_last_changed($nid, $langcode = NULL) {
@@ -2080,7 +2080,7 @@ function node_feed($nids = FALSE, $channel = array()) {
       ->fields('n', array('nid'))
       ->condition('n.promote', 1)
       ->condition('n.status', 1)
-      // TODO Should we filter this by language (more performant)?
+      // @todo Should we filter this by language (more performant)?
       ->groupBy('n.nid')
       ->orderBy('n.created', 'DESC')
       ->range(0, $rss_config->get('items.limit'))