diff --git a/simplesamlphp_auth.module b/simplesamlphp_auth.module
index 26ea5f8..d66951d 100644
--- a/simplesamlphp_auth.module
+++ b/simplesamlphp_auth.module
@@ -53,7 +53,7 @@ function simplesamlphp_auth_user_logout($account) {
   $logout_url = \Drupal::config('simplesamlphp_auth.settings')->get('logout_goto_url');
   $simplesaml = \Drupal::service('simplesamlphp_auth.manager');
 
-  // Only interfere if this user was logged in through simplesaml
+  // Only interfere if this user was logged in through simplesaml.
   if ($simplesaml->isAuthenticated()) {
     // Have to destroy the session here as some configurations of
     // SimpleSAMLphp_auth can create infinite loops. By removing IdP auth before
diff --git a/src/EventSubscriber/SimplesamlSubscriber.php b/src/EventSubscriber/SimplesamlSubscriber.php
index 3bc47b9..1eb4813 100644
--- a/src/EventSubscriber/SimplesamlSubscriber.php
+++ b/src/EventSubscriber/SimplesamlSubscriber.php
@@ -109,7 +109,7 @@ class SimplesamlSubscriber implements EventSubscriberInterface {
   /**
    * Redirect anonymous users from the Drupal login page directly to the external IdP.
    *
-   * @param GetResponseEvent $event
+   * @param \Symfony\Component\HttpKernel\Event\GetResponseEvent $event
    *   The subscribed event.
    */
   public function login_directly_with_external_IdP(GetResponseEvent $event) {
diff --git a/src/Plugin/Block/SimplesamlphpAuthBlock.php b/src/Plugin/Block/SimplesamlphpAuthBlock.php
index af40f65..70f9c1a 100644
--- a/src/Plugin/Block/SimplesamlphpAuthBlock.php
+++ b/src/Plugin/Block/SimplesamlphpAuthBlock.php
@@ -79,7 +79,6 @@ class SimplesamlphpAuthBlock extends BlockBase implements ContainerFactoryPlugin
       ],
     ];
 
-
     if ($this->simplesamlAuth->isActivated()) {
 
       if ($this->simplesamlAuth->isAuthenticated()) {
diff --git a/src/Service/SimplesamlphpAuthManager.php b/src/Service/SimplesamlphpAuthManager.php
index 3e4df21..10bfd0d 100644
--- a/src/Service/SimplesamlphpAuthManager.php
+++ b/src/Service/SimplesamlphpAuthManager.php
@@ -134,7 +134,7 @@ class SimplesamlphpAuthManager {
   /**
    * Returns a SimpleSAML Simple class instance.
    *
-   * @return \SimpleSAML\Auth\Simple|NULL
+   * @return \SimpleSAML\Auth\Simple|null
    *   The SimpleSAML Simple instance.
    */
   protected function getSimpleSamlInstance() {
@@ -163,7 +163,7 @@ class SimplesamlphpAuthManager {
   /**
    * Returns a SimpleSAML configuration instance.
    *
-   * @return \SimpleSAML\Configuration|NULL
+   * @return \SimpleSAML\Configuration|null
    *   The SimpleSAML Configuration instance.
    */
   protected function getSimpleSamlConfiguration() {