diff --git a/core/includes/entity.inc b/core/includes/entity.inc
index e071103..f775bbb 100644
--- a/core/includes/entity.inc
+++ b/core/includes/entity.inc
@@ -11,7 +11,7 @@
  * Clears the entity render cache for all entity types.
  */
 function entity_render_cache_clear() {
-  $entity_manager = Drupal::entityManager();
+  $entity_manager = \Drupal::entityManager();
   foreach ($entity_manager->getDefinitions() as $entity_type => $info) {
     if ($entity_manager->hasHandler($entity_type, 'view_builder')) {
       $entity_manager->getViewBuilder($entity_type)->resetCache();
@@ -116,7 +116,7 @@ function entity_revision_load($entity_type, $revision_id) {
  *
  * @param string $entity_type
  *   The entity type to load, e.g. node or user.
- * @param $revision_id
+ * @param int $revision_id
  *   The revision ID to delete.
  *
  * @deprecated as of Drupal 8.0.x, will be removed before Drupal 9.0.0. Use
@@ -223,9 +223,9 @@ function entity_load_multiple_by_properties($entity_type, array $values) {
  * is useful to determine changes by comparing the entity being saved to the
  * stored entity.
  *
- * @param $entity_type
+ * @param string $entity_type
  *   The entity type to load, e.g. node or user.
- * @param $id
+ * @param int $id
  *   The ID of the entity to load.
  *
  * @return \Drupal\Core\Entity\EntityInterface|null
@@ -307,7 +307,7 @@ function entity_create($entity_type, array $values = array()) {
  *
  * @param \Drupal\Core\Entity\EntityInterface $entity
  *   The entity for which to generate the label.
- * @param $langcode
+ * @param string $langcode
  *   (optional) The language code of the language that should be used for
  *   getting the label. If set to NULL, the entity's default language is
  *   used.
@@ -440,20 +440,21 @@ function entity_view_multiple(array $entities, $view_mode, $langcode = NULL, $re
  *
  * @deprecated as of Drupal 8.0.x, will be removed before Drupal 9.0.0.
  *   If the display is available in configuration use:
- *   @code
- *   \Drupal::entityManager()->getStorage('entity_view_display')->load($entity_type . '.' . $bundle . '.' . $view_mode);
- *   @endcode
+ * @code
+ * \Drupal::entityManager()->getStorage('entity_view_display')->load($entity_type . '.' . $bundle . '.' . $view_mode);
+ * @endcode
+ *
  *   When the display is not available in configuration, you can create a new
  *   EntityViewDisplay object using:
- *   @code
- *   $values = array(
- *     'targetEntityType' => $entity_type,
- *     'bundle' => $bundle,
- *     'mode' => $view_mode,
- *     'status' => TRUE,
- *   ));
- *   \Drupal::entityManager()->getStorage('entity_view_display')->create($values);
- *   @endcode
+ * @code
+ * $values = array(
+ *   'targetEntityType' => $entity_type,
+ *   'bundle' => $bundle,
+ *   'mode' => $view_mode,
+ *   'status' => TRUE,
+ * ));
+ * \Drupal::entityManager()->getStorage('entity_view_display')->create($values);
+ * @endcode
  *
  * @see \Drupal\Core\Entity\EntityStorageInterface::create()
  * @see \Drupal\Core\Entity\EntityStorageInterface::load()
@@ -519,7 +520,8 @@ function entity_get_display($entity_type, $bundle, $view_mode) {
  * @code
  *   \Drupal::entityManager()->getStorage('entity_form_display')->load($entity_type . '.' . $bundle . '.' . $form_mode);
  * @endcode
- *   When the entity form display is not available in configuration, you can create a new
+ *   When the entity form display is not available in
+ *   configuration, you can create a new
  *   EntityFormDisplay object using:
  * @code
  * $values = ('entity_form_display', array(