diff --git a/src/admin/layout/class-engine.php b/src/admin/layout/class-engine.php
index 6f4c2b7..212513e 100644
--- a/src/admin/layout/class-engine.php
+++ b/src/admin/layout/class-engine.php
@@ -14,6 +14,7 @@
  */
 
 namespace footnotes\admin\layout;
+
 use footnotes\includes as Includes;
 
 require_once plugin_dir_path( dirname( __FILE__ ) ) . 'layout/class-init.php';
diff --git a/src/admin/layout/class-init.php b/src/admin/layout/class-init.php
index 4e567c8..4363a93 100644
--- a/src/admin/layout/class-init.php
+++ b/src/admin/layout/class-init.php
@@ -14,6 +14,7 @@
  */
 
 namespace footnotes\admin\layout;
+
 use footnotes\includes as Includes;
 
 /**
diff --git a/src/admin/layout/class-settings.php b/src/admin/layout/class-settings.php
index 2b7dbde..923d618 100644
--- a/src/admin/layout/class-settings.php
+++ b/src/admin/layout/class-settings.php
@@ -14,6 +14,7 @@
  */
 
 namespace footnotes\admin\layout;
+
 use footnotes\includes as Includes;
 
 /**
diff --git a/src/footnotes.php b/src/footnotes.php
index 40ad273..6a1431a 100755
--- a/src/footnotes.php
+++ b/src/footnotes.php
@@ -27,7 +27,6 @@
 
 namespace footnotes;
 
-
 // If this file is called directly, abort.
 if ( ! defined( 'WPINC' ) ) {
 	die;
diff --git a/src/includes/class-activator.php b/src/includes/class-activator.php
index d8f9380..c11e313 100644
--- a/src/includes/class-activator.php
+++ b/src/includes/class-activator.php
@@ -1,13 +1,13 @@
 <?php
 /**
- * footnotes\includes: Activator class
+ * Includes: Activator class
  *
  * `footnotes\includes` consists of functionality that is shared across both
  * the admin- and the public-facing sides of the plugin.
  *
  * The primary entry point is {@see Footnotes}, which uses {@see Loader}
- * to initialise {@see i18n} for internationalization, {@see Admin\Admin} for 
- * admin-specific functionality and {@see General\General} for public-facing 
+ * to initialise {@see i18n} for internationalization, {@see Admin\Admin} for
+ * admin-specific functionality and {@see General\General} for public-facing
  * functionality.
  *
  * It also includes various utility classes:
diff --git a/src/includes/class-config.php b/src/includes/class-config.php
index 5b40379..72620c9 100644
--- a/src/includes/class-config.php
+++ b/src/includes/class-config.php
@@ -1,13 +1,13 @@
 <?php
 /**
- * footnotes\includes: Config class
+ * Includes: Config class
  *
  * `footnotes\includes` consists of functionality that is shared across both
  * the admin- and the public-facing sides of the plugin.
  *
  * The primary entry point is {@see Footnotes}, which uses {@see Loader}
- * to initialise {@see i18n} for internationalization, {@see Admin\Admin} for 
- * admin-specific functionality and {@see General\General} for public-facing 
+ * to initialise {@see i18n} for internationalization, {@see Admin\Admin} for
+ * admin-specific functionality and {@see General\General} for public-facing
  * functionality.
  *
  * It also includes various utility classes:
@@ -39,7 +39,7 @@ namespace footnotes\includes;
  * @package footnotes
  * @since 1.5.0
  * @since 2.8.0 Renamed class from `Footnotes_Config` to `Config`.
- * 							Moved under `footnotes\includes` namespace.
+ *                          Moved under `footnotes\includes` namespace.
  * @todo Remove.
  * @deprecated
  */
diff --git a/src/includes/class-core.php b/src/includes/class-core.php
index 6e554b8..45fb6ac 100644
--- a/src/includes/class-core.php
+++ b/src/includes/class-core.php
@@ -1,13 +1,13 @@
-<?php // phpcs:disable PEAR.Commenting.FileComment.Missing
+<?php
 /**
- * footnotes\includes: Core class
+ * Includes: Core class
  *
  * `footnotes\includes` consists of functionality that is shared across both
  * the admin- and the public-facing sides of the plugin.
  *
  * The primary entry point is {@see Footnotes}, which uses {@see Loader}
- * to initialise {@see i18n} for internationalization, {@see Admin\Admin} for 
- * admin-specific functionality and {@see General\General} for public-facing 
+ * to initialise {@see i18n} for internationalization, {@see Admin\Admin} for
+ * admin-specific functionality and {@see General\General} for public-facing
  * functionality.
  *
  * It also includes various utility classes:
@@ -41,7 +41,7 @@ use footnotes\admin as Admin;
  * @package footnotes
  * @since 1.5.0
  * @since 2.8.0 Renamed class from `Footnotes` to `Core`.
- * 							Moved under `footnotes\includes` namespace.
+ *                          Moved under `footnotes\includes` namespace.
  */
 class Core {
 	/**
diff --git a/src/includes/class-i18n.php b/src/includes/class-i18n.php
index 7689b9e..4f04184 100644
--- a/src/includes/class-i18n.php
+++ b/src/includes/class-i18n.php
@@ -1,4 +1,4 @@
-<?php // phpcs:disable PEAR.NamingConventions.ValidClassName.Invalid
+<?php // phpcs:disable PEAR.NamingConventions.ValidClassName.StartWithCapital
 /**
  * File providing core `i18n` class.
  *
diff --git a/src/includes/class-settings.php b/src/includes/class-settings.php
index 40ac9e6..2f8f09a 100644
--- a/src/includes/class-settings.php
+++ b/src/includes/class-settings.php
@@ -23,7 +23,7 @@ require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-convert.ph
  * @package footnotes
  * @since 1.5.0
  * @since 2.8.0 Renamed class from `Footnotes_Settings` to `Settings`.
- * 							Moved under `footnotes\includes` namespace.
+ *                          Moved under `footnotes\includes` namespace.
  */
 class Settings {
 	/**
diff --git a/src/public/class-general.php b/src/public/class-general.php
index 81eb530..0a9e99e 100644
--- a/src/public/class-general.php
+++ b/src/public/class-general.php
@@ -7,6 +7,7 @@
  */
 
 namespace footnotes\general;
+
 use footnotes\includes as Includes;
 
 /**
diff --git a/src/public/class-parser.php b/src/public/class-parser.php
index 43b09b5..41fbde2 100644
--- a/src/public/class-parser.php
+++ b/src/public/class-parser.php
@@ -8,8 +8,9 @@
  * @since 2.8.0 Rename file from `task.php` to `class-footnotes-parser.php`,
  *                              move from `class/` sub-directory to `public/`.
  */
- 
+
 namespace footnotes\general;
+
 use footnotes\includes as Includes;
 
 /**
diff --git a/src/public/widget/class-base.php b/src/public/widget/class-base.php
index 563e76d..3a5c9b9 100644
--- a/src/public/widget/class-base.php
+++ b/src/public/widget/class-base.php
@@ -11,6 +11,7 @@
  */
 
 namespace footnotes\general\Widget;
+
 use footnotes\includes as Includes;
 
 /**
diff --git a/src/public/widget/class-reference-container.php b/src/public/widget/class-reference-container.php
index 8e83324..c051a96 100644
--- a/src/public/widget/class-reference-container.php
+++ b/src/public/widget/class-reference-container.php
@@ -11,6 +11,7 @@
  */
 
 namespace footnotes\general\Widget;
+
 use footnotes\includes as Includes;
 
 require_once plugin_dir_path( dirname( __FILE__ ) ) . 'widget/class-base.php';