diff --git a/web/modules/custom/dg_autologout/dg_autologout.api.php b/web/modules/custom/dg_autologout/dg_autologout.api.php
index 5027bf0c..e2c78f92 100644
--- a/web/modules/custom/dg_autologout/dg_autologout.api.php
+++ b/web/modules/custom/dg_autologout/dg_autologout.api.php
@@ -10,7 +10,8 @@
  *
  * This allows other modules to indicate that a page should not be included
  * in the dg_autologout checks. This works in the same way as not ticking the
- * enforce on admin pages option for dg_autologout which stops a user being logged
+ * enforce on admin pages option for
+ * dg_autologout which stops a user being logged
  * out of admin pages.
  *
  * @return bool
diff --git a/web/modules/custom/dg_autologout/dg_autologout.install b/web/modules/custom/dg_autologout/dg_autologout.install
index e9b9c1e4..447aae54 100644
--- a/web/modules/custom/dg_autologout/dg_autologout.install
+++ b/web/modules/custom/dg_autologout/dg_autologout.install
@@ -24,7 +24,8 @@ function dg_autologout_update_8001(&$sandbox) {
   $result = array_slice($result, $sandbox['current'], $limit);
   foreach ($result as $row) {
     $key = $row->name;
-    // User uid is a part of the key after. E.g. dg_autologout.user.1 for user 1.
+    // User uid is a part of the key after.
+    // E.g. dg_autologout.user.1 for user 1.
     $user_id = (substr($key, 16));
     $data = unserialize($row->data);
     \Drupal::service('user.data')->set('dg_autologout', $user_id, 'timeout', $data['timeout']);
diff --git a/web/modules/custom/dg_autologout/src/AutologoutManager.php b/web/modules/custom/dg_autologout/src/AutologoutManager.php
index d3921ab6..446b841c 100644
--- a/web/modules/custom/dg_autologout/src/AutologoutManager.php
+++ b/web/modules/custom/dg_autologout/src/AutologoutManager.php
@@ -2,7 +2,6 @@
 
 namespace Drupal\dg_autologout;
 
-// use Drupal\dg_autologout\DgAutologoutManagerInterface as test;
 use Drupal\Component\Datetime\TimeInterface;
 use Drupal\Component\Utility\Xss;
 use Drupal\Core\Config\Config;
diff --git a/web/modules/custom/dg_autologout/src/Controller/AutologoutController.php b/web/modules/custom/dg_autologout/src/Controller/AutologoutController.php
index 38b86c0c..2d0eaae2 100644
--- a/web/modules/custom/dg_autologout/src/Controller/AutologoutController.php
+++ b/web/modules/custom/dg_autologout/src/Controller/AutologoutController.php
@@ -1,6 +1,5 @@
 <?php
 
-
 namespace Drupal\dg_autologout\Controller;
 
 use Drupal\Component\Datetime\TimeInterface;
diff --git a/web/modules/custom/dg_autologout/src/EventSubscriber/AutologoutSubscriber.php b/web/modules/custom/dg_autologout/src/EventSubscriber/AutologoutSubscriber.php
index b2d4d11d..e160546e 100644
--- a/web/modules/custom/dg_autologout/src/EventSubscriber/AutologoutSubscriber.php
+++ b/web/modules/custom/dg_autologout/src/EventSubscriber/AutologoutSubscriber.php
@@ -1,5 +1,4 @@
 <?php
-// todo: come back to this file
 
 namespace Drupal\dg_autologout\EventSubscriber;
 
@@ -26,7 +25,7 @@ class AutologoutSubscriber implements EventSubscriberInterface {
    *
    * @var \Drupal\dg_autologout\DgAutologoutManagerInterface
    */
-  protected DgAutologoutManagerInterface $AutologoutManager;
+  protected DgAutologoutManagerInterface $autologoutManager;
 
   /**
    * The user account service.
diff --git a/web/modules/custom/dg_autologout/src/Form/AutologoutBlockForm.php b/web/modules/custom/dg_autologout/src/Form/AutologoutBlockForm.php
index 2f42ff53..29aaaa88 100644
--- a/web/modules/custom/dg_autologout/src/Form/AutologoutBlockForm.php
+++ b/web/modules/custom/dg_autologout/src/Form/AutologoutBlockForm.php
@@ -10,14 +10,14 @@
 /**
  * Provides a settings for autologout module.
  */
-class dg_AutologoutBlockForm extends FormBase {
+class AutologoutBlockForm extends FormBase {
 
   /**
    * The autologout manager service.
    *
    * @var \Drupal\dg_autologout\DgAutologoutManagerInterface
    */
-  protected $AutologoutManager;
+  protected $autologoutManager;
 
   /**
    * {@inheritdoc}
diff --git a/web/modules/custom/dg_autologout/src/Plugin/migrate/destination/dg_ConfigAutologoutRoles.php b/web/modules/custom/dg_autologout/src/Plugin/migrate/destination/ConfigAutologoutRoles.php
similarity index 100%
rename from web/modules/custom/dg_autologout/src/Plugin/migrate/destination/dg_ConfigAutologoutRoles.php
rename to web/modules/custom/dg_autologout/src/Plugin/migrate/destination/ConfigAutologoutRoles.php
diff --git a/web/modules/custom/dg_autologout/src/Plugin/migrate/source/dg_AutologoutRoles.php b/web/modules/custom/dg_autologout/src/Plugin/migrate/source/AutologoutRoles.php
similarity index 100%
rename from web/modules/custom/dg_autologout/src/Plugin/migrate/source/dg_AutologoutRoles.php
rename to web/modules/custom/dg_autologout/src/Plugin/migrate/source/AutologoutRoles.php
diff --git a/web/modules/custom/dg_autologout/src/Plugin/migrate/source/d6/dg_AutologoutRoles.php b/web/modules/custom/dg_autologout/src/Plugin/migrate/source/d6/AutologoutRoles.php
similarity index 100%
rename from web/modules/custom/dg_autologout/src/Plugin/migrate/source/d6/dg_AutologoutRoles.php
rename to web/modules/custom/dg_autologout/src/Plugin/migrate/source/d6/AutologoutRoles.php
diff --git a/web/modules/custom/dg_autologout/src/Plugin/migrate/source/d7/dg_AutologoutRoles.php b/web/modules/custom/dg_autologout/src/Plugin/migrate/source/d7/AutologoutRoles.php
similarity index 100%
rename from web/modules/custom/dg_autologout/src/Plugin/migrate/source/d7/dg_AutologoutRoles.php
rename to web/modules/custom/dg_autologout/src/Plugin/migrate/source/d7/AutologoutRoles.php