diff --git a/contact_poup.module b/contact_poup.module
index 9116a80..a90fe51 100644
--- a/contact_poup.module
+++ b/contact_poup.module
@@ -14,4 +14,4 @@ function contact_poup_theme($existing, $type, $theme, $path) {
       'variables' => ['link' => [], 'contact_form' => []],
     ],
   ];
-}
\ No newline at end of file
+}
diff --git a/src/Plugin/Block/ContactPopupBlock.php b/src/Plugin/Block/ContactPopupBlock.php
index 7d50900..9608fd5 100644
--- a/src/Plugin/Block/ContactPopupBlock.php
+++ b/src/Plugin/Block/ContactPopupBlock.php
@@ -48,7 +48,7 @@ class ContactPopupBlock extends BlockBase implements ContainerFactoryPluginInter
    *   The plugin implementation definition.
    * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
    *   The entity_type.manager service.
-   *   * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
+   * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
    *   The current_route_match service.
    */
   public function __construct(array $configuration, $plugin_id, $plugin_definition, EntityTypeManagerInterface $entity_type_manager, RouteMatchInterface $route_match) {
@@ -85,13 +85,13 @@ class ContactPopupBlock extends BlockBase implements ContainerFactoryPluginInter
       /** @var \Drupal\user\Entity\User $user */
       $user = $this->routeMatch->getParameter('user');
 
-      // Deny access to the contact form link if we are not on a user related page
+      // Deny access the contact form link if we are not on a user-related page.
       // or we have no access to that page.
       if (empty($user)) {
         return AccessResult::forbidden();
       }
 
-      // Do not display the link if the user is on his profile page.
+      // Don't display the link if the user is on profile page.
       if ($user->id() == $account->id()) {
         return AccessResult::forbidden();
       }
@@ -100,7 +100,8 @@ class ContactPopupBlock extends BlockBase implements ContainerFactoryPluginInter
     }
 
     // Access to other contact forms is equal to the permission of the
-    // entity.contact_form.canonical route. Once https://www.drupal.org/node/2724503
+    // entity.contact_form.canonical route.
+    // Once https://www.drupal.org/node/2724503
     // has landed, see if we can support per form access permission.
     return $contact_form->access('view', $account, TRUE);
   }
@@ -112,20 +113,20 @@ class ContactPopupBlock extends BlockBase implements ContainerFactoryPluginInter
     $form = parent::blockForm($form, $form_state);
     $config = $this->getConfiguration();
 
-    $form['contact_form'] = array(
+    $form['contact_form'] = [
       '#type' => 'select',
       '#title' => $this->t('Contact form'),
       '#description' => $this->t('Select the contact form to use.'),
       '#options' => $this->listContactForms(),
       '#default_value' => isset($config['contact_form']) ? $config['contact_form'] : '',
-    );
+    ];
 
-    $form['link_title'] = array(
+    $form['link_title'] = [
       '#type' => 'textfield',
       '#title' => $this->t('The link title'),
       '#description' => $this->t('The title to use for the link. Leave empty for using the contact form label.'),
       '#default_value' => isset($config['link_title']) ? $config['link_title'] : '',
-    );
+    ];
 
     return $form;
   }
@@ -150,15 +151,15 @@ class ContactPopupBlock extends BlockBase implements ContainerFactoryPluginInter
 
     $id = $contact_form->id();
 
-    $options = array(
-      'attributes' => array(
-        'class' => array(
+    $options = [
+      'attributes' => [
+        'class' => [
           'use-ajax',
           'contact-form',
-        ),
+        ],
         'data-dialog-type' => 'modal',
-      ),
-    );
+      ],
+    ];
 
     // Personnal contact form.
     if ($id === 'personal') {
@@ -201,7 +202,9 @@ class ContactPopupBlock extends BlockBase implements ContainerFactoryPluginInter
   }
 
   /**
-   * @return array $options
+   * Loads the contact form list.
+   *
+   * @return \Drupal\contact\Entity\ContactForm
    *   An array of available contact forms.
    */
   private function listContactForms() {