diff --git a/src/admin/class-footnotes-admin.php b/src/admin/class-footnotes-admin.php
index 05f1ad8..2809853 100644
--- a/src/admin/class-footnotes-admin.php
+++ b/src/admin/class-footnotes-admin.php
@@ -1,56 +1,62 @@
 <?php
 /**
- * The admin-specific functionality of the plugin.
+ * Admin: Footnotes_Admin class
  *
- * @since      2.8.0
+ * The Admin. subpackage is initialised at runtime by the {@see Footnotes_Admin}
+ * class, which draws in the {@see Footnotes_WYSIWYG} class for WYSIWYG editor
+ * integration and the {@see footnotes\admin_layout} subpackage for rendering
+ * dashboard pages.
  *
- * @package    footnotes
- * @subpackage admin
+ * @package  footnotes\admin
+ * @since  2.8.0
  */
 
 /**
- * The admin-specific functionality of the plugin.
+ * Class provide all admin-specific functionality of the plugin.
  *
  * Defines the plugin name, version, and enqueues all admin-specific stylesheets
  * and JavaScript.
  *
- * @package    footnotes
- * @subpackage admin
+ * @package  footnotes\admin
+ * @since  2.8.0
  */
 class Footnotes_Admin {
 
 	/**
 	 * The ID of this plugin.
 	 *
-	 * @since    2.8.0
-	 * @access   private
-	 * @var      string    $plugin_name    The ID of this plugin.
+	 * @access  private
+	 * @since  2.8.0
+	 * @see  Footnotes::$plugin_name
+	 * @var  string  $plugin_name  The ID of this plugin.
 	 */
 	private $plugin_name;
 
 	/**
 	 * The version of this plugin.
 	 *
-	 * @since    2.8.0
-	 * @access   private
-	 * @var      string    $version    The current version of this plugin.
+	 * @access  private
+	 * @since  2.8.0
+	 * @see  Footnotes::$version
+	 * @var  string  $version  The current version of this plugin.
 	 */
 	private $version;
 
 	/**
 	 * The WYSIWYG editor integration object.
 	 *
-	 * @since    2.8.0
-	 * @var      Footnotes_WYSIWYG    $wysiwyg    The WYSIWYG editor integration object.
+	 * @since  2.8.0
+	 * @var  Footnotes_WYSIWYG  $wysiwyg  The WYSIWYG editor integration object.
 	 */
 	public $wysiwyg;
 
 	/**
 	 * Initialize the class and set its properties.
+	 
+	 * @param  string  $plugin_name  The name of this plugin.
+	 * @param  string  $version  The version of this plugin.
 	 *
-	 * @since    2.8.0
-	 * @param    string $plugin_name       The name of this plugin.
-	 * @param    string $version    The version of this plugin.
+	 * @since  2.8.0
 	 */
 	public function __construct( $plugin_name, $version ) {
 
@@ -64,14 +70,15 @@ class Footnotes_Admin {
 	/**
 	 * Load the required admin-specific dependencies.
 	 *
-	 * Include the following files that provide the admin-specific functionality
+	 * Includes the following files that provide the admin-specific functionality
 	 * of this plugin:
 	 *
-	 * - `Footnotes_WYSIWYG`. Provides plugin integration with the WYSIWYG editor.
-	 * - `Footnotes_Layout_Settings`. Defines the plugin dashboard page(s).
+	 * - {@see Footnotes_WYSIWYG}: Provides plugin integration with the WYSIWYG editor.
+	 * - {@see Footnotes_Layout_Settings}: Defines the plugin dashboard page(s).
 	 *
-	 * @since    2.8.0
-	 * @access   private
+	 * @access  private
+	 *
+	 * @since  2.8.0
 	 */
 	private function load_dependencies() {
 		/**
@@ -92,7 +99,7 @@ class Footnotes_Admin {
 	/**
 	 * Register the stylesheets for the admin area.
 	 *
-	 * @since    2.8.0
+	 * @since  2.8.0
 	 */
 	public function enqueue_styles() {
 
@@ -112,7 +119,7 @@ class Footnotes_Admin {
 	/**
 	 * Register the JavaScript for the admin area.
 	 *
-	 * @since    2.8.0
+	 * @since  2.8.0
 	 */
 	public function enqueue_scripts() {
 
@@ -133,10 +140,11 @@ class Footnotes_Admin {
 	/**
 	 * Appends the Plugin links for display in the dashboard Plugins page.
 	 *
-	 * @since 1.5.0
-	 * @since 2.8.0 Moved into `Footnote_Admin` class.
-	 * @param string[] $links The default set of links to display.
-	 * @return string[] The full set of links to display.
+	 * @param  string[]  $links  The default set of links to display.
+	 * @return  string[]  The full set of links to display.
+	 *
+	 * @since  1.5.0
+	 * @since  2.8.0  Moved from `Footnotes_Hooks` class to `Footnotes_Admin`.
 	 */
 	public function footnotes_action_links( array $links ): array {
 		// Append link to the WordPress Plugin page.
diff --git a/src/admin/class-footnotes-wysiwyg.php b/src/admin/class-footnotes-wysiwyg.php
index 3c6cb76..037ec59 100644
--- a/src/admin/class-footnotes-wysiwyg.php
+++ b/src/admin/class-footnotes-wysiwyg.php
@@ -1,34 +1,42 @@
-<?php // phpcs:disable Squiz.Commenting.FileComment.Missing
+<?php
 /**
- * File provides WYSIWYG editor integration.
+ * Admin: Footnotes_WYSIWYG class
  *
- * @since      1.5.0
+ * The Admin. subpackage is initialised at runtime by the {@see Footnotes_Admin}
+ * class, which draws in the {@see Footnotes_WYSIWYG} class for WYSIWYG editor
+ * integration and the {@see footnotes\admin_layout} subpackage for rendering
+ * dashboard pages.
  *
- * @package    footnotes
- * @subpackage admin
+ * @package  footnotes\admin
+ * @since  1.5.0
+ * @since  2.8.0  Rename file from `wysiwyg.php` to `class-footnotes-wysiwyg.php`,
+ *								move from `class/` sub-directory to `admin/`.
  */
 
 /**
- * Handles the WSYIWYG-Buttons.
+ * Class providing WYSIWYG editor intergration for the plugin.
  *
- * @since 1.5.0
+ * @package  footnotes\admin
+ * @since  1.5.0
  */
 class Footnotes_WYSIWYG {
 
 	/**
 	 * The ID of this plugin.
 	 *
-	 * @since    2.8.0
-	 * @access   private
-	 * @var      string    $plugin_name    The ID of this plugin.
+	 * @access  private
+	 * @var  string  $plugin_name  The ID of this plugin.
+	 *
+	 * @since  2.8.0
 	 */
 	private $plugin_name;
 
 	/**
 	 * Initialize the class and set its properties.
 	 *
-	 * @since    2.8.0
-	 * @param    string $plugin_name       The name of this plugin.
+	 * @param  string $plugin_name  The name of this plugin.
+	 *
+	 * @since  2.8.0
 	 */
 	public function __construct( $plugin_name ) {
 
@@ -39,11 +47,11 @@ class Footnotes_WYSIWYG {
 	/**
 	 * Append a new Button to the WYSIWYG editor of Posts and Pages.
 	 *
-	 * @since 1.5.0
-	 * @param array $p_arr_buttons pre defined Buttons from WordPress.
-	 * @return array
+	 * @param  string[]  $p_arr_buttons  Already-defined editor buttons.
+	 * @return  string[]
 	 *
-	 * @todo Does this need to be `static`?
+	 * @since  1.5.0
+	 * @todo  Should this be `static`?
 	 */
 	public static function new_visual_editor_button( $p_arr_buttons ) {
 		array_push( $p_arr_buttons, 'footnotes' );
@@ -53,7 +61,7 @@ class Footnotes_WYSIWYG {
 	/**
 	 * Add a new button to the plain text editor.
 	 *
-	 * @since 1.5.0
+	 * @since  1.5.0
 	 */
 	public static function new_plain_text_editor_button() {
 		$l_obj_template = new Footnotes_Template( Footnotes_Template::C_STR_DASHBOARD, 'editor-button' );
@@ -65,11 +73,11 @@ class Footnotes_WYSIWYG {
 	/**
 	 * Includes the Plugins WYSIWYG editor script.
 	 *
-	 * @since 1.5.0
-	 * @param array $p_arr_plugins Scripts to be included to the editor.
-	 * @return array
+	 * @param  string[]  $p_arr_plugins  Scripts to be included by the editor.
+	 * @return  string[]
 	 *
-	 * @todo Does this need to be `static`?
+	 * @since  1.5.0
+	 * @todo  Should this be `static`?
 	 */
 	public static function include_scripts( $p_arr_plugins ) {
 		$p_arr_plugins['footnotes'] = plugins_url( '/../admin/js/wysiwyg-editor' . ( ( PRODUCTION_ENV ) ? '.min' : '' ) . '.js', __FILE__ );
@@ -80,7 +88,7 @@ class Footnotes_WYSIWYG {
 	 * AJAX Callback function when the Footnotes Button is clicked. Either in the Plain text or Visual editor.
 	 * Returns an JSON encoded array with the Footnotes start and end short code.
 	 *
-	 * @since 1.5.0
+	 * @since  1.5.0
 	 */
 	public static function ajax_callback() {
 		// Get start and end tag for the footnotes short code.
diff --git a/src/admin/layout/class-footnotes-layout-engine.php b/src/admin/layout/class-footnotes-layout-engine.php
index d45576c..7de4d72 100644
--- a/src/admin/layout/class-footnotes-layout-engine.php
+++ b/src/admin/layout/class-footnotes-layout-engine.php
@@ -1,104 +1,134 @@
 <?php // phpcs:disable WordPress.Security.ValidatedSanitizedInput.InputNotSanitized, WordPress.Security.EscapeOutput.OutputNotEscaped
 /**
- * Includes Layout Engine for the admin dashboard.
+ * Admin. Layouts: Footnotes_Layout_Engine class
  *
- * @since 1.5.0
- * @since 2.1.2  add versioning of settings.css for cache busting
- * @since 2.1.4  automate passing version number for cache busting
- * @since 2.1.4  optional step argument and support for floating in numbox
- * @since 2.1.6  fix punctuation-related localization issue in dashboard labels
- * @since 2.5.5  Bugfix: Stylesheets: minify to shrink the carbon footprint, increase speed and implement best practice, thanks to @docteurfitness issue report.
+ * The Admin. Layouts subpackage is composed of the {@see Footnotes_Layout_Engine}
+ * abstract class, which is extended by the {@see Footnotes_Layout_Settings}
+ * sub-class. The subpackage is initialised at runtime by the {@see 
+ * Footnotes_Layout_Init} class.
  *
- * @package footnotes
- * @subpackage admin_layout
+ * @package  footnotes\admin_layout
+ * @since  1.5.0
+ * @since  2.8.0  Rename file from `layout.php` to `class-footnotes-layout-engine.php`,
+ *								rename `dashboard/` sub-directory to `layout/`.
  */
 
 require_once plugin_dir_path( dirname( __FILE__ ) ) . 'layout/class-footnotes-layout-init.php';
 
 /**
- * Layout Engine for the administration dashboard.
+ * Class to be extended by page layout sub-classes.
  *
+ * @abstract
+ 
+ * @package  footnotes\admin_layout
  * @since  1.5.0
- *
- * @package    footnotes
- * @subpackage admin_layout
  */
 abstract class Footnotes_Layout_Engine {
 
 	/**
 	 * The ID of this plugin.
 	 *
-	 * @since    2.8.0
-	 * @access   private
-	 * @var      string    $plugin_name    The ID of this plugin.
+	 * @access  protected
+	 * @var  string  $plugin_name  The ID of this plugin.
+	 *
+	 * @since  2.8.0
 	 */
 	protected $plugin_name;
 
 	/**
-	 * Stores the Hook connection string for the child sub page.
+	 * Stores the Hook connection string for the child sub-page.
+	 *
+	 * @access  protected
+	 * @var  null|string
 	 *
 	 * @since  1.5.0
-	 * @var null|string
 	 */
 	protected $a_str_sub_page_hook = null;
 
 	/**
-	 * Stores all Sections for the child sub page.
+	 * Stores all Sections for the child sub-page.
 	 *
-	 * @since 1.5.0
-	 * @var array
+	 * @access  protected
+	 * @var  array
+	 *
+	 * @since  1.5.0
 	 */
 	protected $a_arr_sections = array();
 
 	/**
-	 * Returns a Priority index. Lower numbers have a higher Priority.
+	 * Returns a Priority index. Lower numbers have a higher priority.
 	 *
-	 * @since 1.5.0
-	 * @return int
+	 * @abstract
+	 * @return  int
+	 *
+	 * @since  1.5.0
 	 */
 	abstract public function get_priority();
 
 	/**
-	 * Returns the unique slug of the child sub page.
+	 * Returns the unique slug of the child sub-page.
 	 *
-	 * @since 1.5.0
-	 * @return string
+	 * @abstract
+	 * @access  protected
+	 * @return  string
+	 *
+	 * @since  1.5.0
 	 */
 	abstract protected function get_sub_page_slug();
 
 	/**
-	 * Returns the title of the child sub page.
+	 * Returns the title of the child sub-page.
 	 *
-	 * @since 1.5.0
-	 * @return string
+	 * @abstract
+	 * @access  protected
+	 * @return  string
+	 *
+	 * @since  1.5.0
 	 */
 	abstract protected function get_sub_page_title();
 
 	/**
-	 * Returns an array of all registered sections for a sub page.
+	 * Returns an array of all registered sections for a sub-page.
+	 *
+	 * @abstract
+	 * @access  protected
+	 * @return  array
 	 *
 	 * @since  1.5.0
-	 * @return array
 	 */
 	abstract protected function get_sections();
 
 	/**
 	 * Returns an array of all registered meta boxes.
 	 *
+	 * @abstract
+	 * @access  protected
+	 * @return  array
+	 *
 	 * @since  1.5.0
-	 * @return array
 	 */
 	abstract protected function get_meta_boxes();
 
 	/**
-	 * Returns an array describing a sub page section.
+	 * Returns an array describing a sub-page section.
 	 *
-	 * @since 1.5.0
-	 * @param string $p_str_id Unique ID suffix.
-	 * @param string $p_str_title Title of the section.
-	 * @param int    $p_int_settings_container_index Settings Container Index.
-	 * @param bool   $p_bool_has_submit_button Should a Submit Button be displayed for this section, default: true.
-	 * @return array Array describing the section.
+	 * @access  protected
+	 * @param  string  $p_str_id  Unique ID suffix.
+	 * @param  string  $p_str_title  Title of the section.
+	 * @param  int  $p_int_settings_container_index  Settings Container index.
+	 * @param  bool  $p_bool_has_submit_button  Whether a ‘Submit’ button should 
+	 *																					be displayed for this section. Default `true`.
+	 * @return  array  {
+	 *     A dashboard section.
+	 *
+	 *     @type  string  $id  Section ID.
+	 *     @type  string  $title  Section title.
+	 *     @type  bool  $submit  Whether the section has a submit button or not.
+	 *     @type  int  $container  Settings Container index.
+	 * }
+	 *
+	 * @since  1.5.0
+	 * @todo  Refactor sections into their own class?
 	 */
 	protected function add_section( $p_str_id, $p_str_title, $p_int_settings_container_index, $p_bool_has_submit_button = true ) {
 		return array(
@@ -112,12 +142,23 @@ abstract class Footnotes_Layout_Engine {
 	/**
 	 * Returns an array describing a meta box.
 	 *
+	 * @access  protected
+	 * @param  string  $p_str_section_id  Parent section ID.
+	 * @param  string  $p_str_id  Unique ID suffix.
+	 * @param  string  $p_str_title  Title for the meta box.
+	 * @param  string  $p_str_callback_function_name  Class method name for callback.
+	 * @return  array  {
+	 *     A dashboard meta box.
+	 *
+	 *     @type  string  $parent  Parent section ID.
+	 *     @type  string  $id  Meta box ID.
+	 *     @type  string  $title  Meta box title.
+	 *     @type  string  $callback  Meta box callback function.
+	 * }
+	 *
 	 * @since  1.5.0
-	 * @param string $p_str_section_id Parent Section ID.
-	 * @param string $p_str_id Unique ID suffix.
-	 * @param string $p_str_title Title for the meta box.
-	 * @param string $p_str_callback_function_name Class method name for callback.
-	 * @return array meta box description to be able to append a meta box to the output.
+	 * @todo  Refactor meta boxes into their own class?
+	 * @todo  Pass actual functions rather than strings?
 	 */
 	protected function add_meta_box( $p_str_section_id, $p_str_id, $p_str_title, $p_str_callback_function_name ) {
 		return array(
@@ -129,7 +170,7 @@ abstract class Footnotes_Layout_Engine {
 	}
 
 	/**
-	 * Registers a sub page.
+	 * Registers a sub-page.
 	 *
 	 * @since  1.5.0
 	 */
@@ -155,9 +196,9 @@ abstract class Footnotes_Layout_Engine {
 	}
 
 	/**
-	 * Registers all sections for a sub page.
+	 * Registers all sections for a sub-page.
 	 *
-	 * @since 1.5.0
+	 * @since  1.5.0
 	 */
 	public function register_sections() {
 		foreach ( $this->get_sections() as $l_arr_section ) {
@@ -174,10 +215,12 @@ abstract class Footnotes_Layout_Engine {
 	}
 
 	/**
-	 * Registers all Meta boxes for a sub page.
+	 * Registers all Meta boxes for a sub-page.
 	 *
-	 * @since 1.5.0
-	 * @param string $p_str_parent_id Parent section unique id.
+	 * @access  private
+	 * @param  string  $p_str_parent_id  Parent section unique ID.
+	 *
+	 * @since  1.5.0
 	 */
 	private function register_meta_boxes( $p_str_parent_id ) {
 		// Iterate through each meta box.
@@ -196,12 +239,14 @@ abstract class Footnotes_Layout_Engine {
 	}
 
 	/**
-	 * Append javascript and css files for specific sub page.
+	 * Append JavaScript and CSS files for specific sub-page.
+	 *
+	 * @access  private
 	 *
 	 * @since  1.5.0
+	 * @todo  Move to {@see Footnotes_Admin}.
 	 */
 	private function append_scripts() {
-		// TODO: Move to `Footnotes_Admin`.
 		wp_enqueue_script( 'postbox' );
 		wp_enqueue_style( 'wp-color-picker' );
 		wp_enqueue_script( 'wp-color-picker' );
@@ -209,15 +254,14 @@ abstract class Footnotes_Layout_Engine {
 
 	// phpcs:disable WordPress.Security.NonceVerification.Recommended, WordPress.Security.NonceVerification.Missing
 	/**
-	 * Displays the content of specific sub page.
+	 * Displays the content of specific sub-page.
 	 *
 	 * @since  1.5.0
+	 * @todo  Review nonce verification.
 	 */
 	public function display_content() {
 		$this->append_scripts();
 
-		// TODO: add nonce verification.
-
 		// Get the current section.
 		reset( $this->a_arr_sections );
 		$l_str_active_section_id = isset( $_GET['t'] ) ? wp_unslash( $_GET['t'] ) : key( $this->a_arr_sections );
@@ -276,14 +320,17 @@ abstract class Footnotes_Layout_Engine {
 		echo '});';
 		echo '</script>';
 	}
-	// phpcs:enable  WordPress.Security.NonceVerification.Recommended, WordPress.Security.NonceVerification.Missing
+	// phpcs:enable WordPress.Security.NonceVerification.Recommended, WordPress.Security.NonceVerification.Missing
 
 	// phpcs:disable WordPress.Security.NonceVerification.Recommended, WordPress.Security.NonceVerification.Missing
 	/**
-	 * Save all Plugin settings.
+	 * Save all plugin settings.
 	 *
-	 * @since 1.5.0
-	 * @return bool
+	 * @access  private
+	 * @return  bool  `true` on save success, else `false`.
+	 *
+	 * @since  1.5.0
+	 * @todo  Review nonce verification.
 	 */
 	private function save_settings() {
 		$l_arr_new_settings = array();
@@ -309,35 +356,31 @@ abstract class Footnotes_Layout_Engine {
 	// phpcs:enable WordPress.Security.NonceVerification.Recommended, WordPress.Security.NonceVerification.Missing
 
 	/**
-	 * Output the Description of a section. May be overwritten in any section.
+	 * Output the description of a section. May be overwritten in any section.
 	 *
-	 * @since 1.5.0
+	 * @since  1.5.0
+	 * @todo  Required? Should be `abstract`?
 	 */
 	public function description() {
 		// Default no description will be displayed.
 	}
 
 	/**
-	 * Loads specific setting and returns an array with the keys [id, name, value].
+	 * Loads a specified setting.
 	 *
-	 * @since 1.5.0
-	 * @param string $p_str_setting_key_name Settings Array key name.
-	 * @return array Contains Settings ID, Settings Name and Settings Value.
+	 * @access  protected
+	 * @param  string  $p_str_setting_key_name  Setting key.	
+	 * @return  array  {
+	 *     A configurable setting.
 	 *
-	 * @since 2.5.11 Remove escapement function.
-	 * When refactoring the codebase after 2.5.8, all and every output was escaped.
-	 * After noticing that the plugin was broken, all escapement functions were removed.
-	 * @link https://github.com/markcheret/footnotes/pull/50/commits/25c3f2f12eb5de1079e9215bf624ec4289b095a5
-	 * @link https://github.com/markcheret/footnotes/pull/50#issuecomment-787624123
-	 * In that process, this instance of esc_attr() was removed too, so the plugin was
-	 * broken again.
-	 * @link https://github.com/markcheret/footnotes/pull/50/commits/25c3f2f12eb5de1079e9215bf624ec4289b095a5#diff-a8ed6e859c32a18fc10bbbad3b4dd8ce7f43f2378d29471c7638e314ab30f1bdL349-L354
+	 *     @type  string  $id  Setting key.
+	 *     @type  string  $name  Setting name.
+	 *     @type  string  $value  Setting value.
+	 * }
 	 *
-	 * @since 2.5.15 To fix it, the data was escaped in add_select_box() instead.
-	 * @since 2.6.1  Restore esc_attr() in load_setting().
-	 * @see add_select_box()
-	 * This is the only instance of esc_|kses|sanitize in the pre-2.5.11 codebase.
-	 * Removing this did not fix the quotation mark backslash escapement bug.
+	 * @since  1.5.0
+	 * @since  2.5.11  Broken due to accidental removal of `esc_attr()` call.
+	 * @since  2.6.1  Restore `esc_attr()` call.
 	 */
 	protected function load_setting( $p_str_setting_key_name ) {
 		// Get current section.
@@ -348,45 +391,31 @@ abstract class Footnotes_Layout_Engine {
 		$p_arr_return['value'] = esc_attr( Footnotes_Settings::instance()->get( $p_str_setting_key_name ) );
 		return $p_arr_return;
 	}
-
+	
 	/**
-	 * Returns a line break to start a new line.
+	 * Returns a simple text inside HTML `<span>` element.
+	 *
+	 * @access  protected
+	 * @param  string  $p_str_text  Message to be surrounded with `<span>` tags.
+	 * @return  string
 	 *
 	 * @since  1.5.0
-	 * @return string
-	 */
-	protected function add_newline() {
-		return '<br/>';
-	}
-
-	/**
-	 * Returns a line break to have a space between two lines.
-	 *
-	 * @since  1.5.0
-	 * @return string
-	 */
-	protected function add_line_space() {
-		return '<br/><br/>';
-	}
-
-	/**
-	 * Returns a simple text inside html <span> text.
-	 *
-	 * @since  1.5.0
-	 * @param string $p_str_text Message to be surrounded with simple html tag (span).
-	 * @return string
+	 * @todo  Refactor HTML generation.
 	 */
 	protected function add_text( $p_str_text ) {
 		return sprintf( '<span>%s</span>', $p_str_text );
 	}
 
 	/**
-	 * Returns the html tag for an input/select label.
+	 * Returns the HTML tag for an `<input>`/`<select>` label.
+	 *
+	 * @access  protected
+	 * @param  string  $p_str_setting_name  Settings key.
+	 * @param  string  $p_str_caption  Label caption.
+	 * @return  string
 	 *
 	 * @since  1.5.0
-	 * @param string $p_str_setting_name Name of the Settings key to connect the Label with the input/select field.
-	 * @param string $p_str_caption Label caption.
-	 * @return string
+	 * @todo  Refactor HTML generation.
 	 */
 	protected function add_label( $p_str_setting_name, $p_str_caption ) {
 		if ( empty( $p_str_caption ) ) {
@@ -401,20 +430,24 @@ abstract class Footnotes_Layout_Engine {
 		 * narrow per new school.
 		 * Add colon to label strings for inclusion in localization. Colon after
 		 * label is widely preferred best practice, mandatory per
-		 * [style guides](https://softwareengineering.stackexchange.com/questions/234546/colons-in-internationalized-ui).
+		 * {@link https://softwareengineering.stackexchange.com/questions/234546/colons-in-internationalized-ui
+		 * style guides}.
 		 */
 		return sprintf( '<label for="%s">%s</label>', $p_str_setting_name, $p_str_caption );
 	}
 
 	/**
-	 * Returns the html tag for an input [type = text].
+	 * Constructs the HTML for a text `<input>` element.
+	 *
+	 * @access  protected
+	 * @param  string  $p_str_setting_name  Setting key.
+	 * @param  int  $p_str_max_length  Maximum length of the input. Default length 999 chars.
+	 * @param  bool  $p_bool_readonly  Set the input to be read only. Default `false`.
+	 * @param  bool  $p_bool_hidden  Set the input to be hidden. Default `false`.
+	 * @return  string
 	 *
 	 * @since  1.5.0
-	 * @param string $p_str_setting_name Name of the Settings key to pre load the input field.
-	 * @param int    $p_str_max_length Maximum length of the input, default 999 characters.
-	 * @param bool   $p_bool_readonly Set the input to be read only, default false.
-	 * @param bool   $p_bool_hidden Set the input to be hidden, default false.
-	 * @return string
+	 * @todo  Refactor HTML generation.
 	 */
 	protected function add_text_box( $p_str_setting_name, $p_str_max_length = 999, $p_bool_readonly = false, $p_bool_hidden = false ) {
 		$l_str_style = '';
@@ -435,11 +468,14 @@ abstract class Footnotes_Layout_Engine {
 	}
 
 	/**
-	 * Returns the html tag for an input [type = checkbox].
+	 * Constructs the HTML for a checkbox `<input>` element.
+	 *
+	 * @access  protected
+	 * @param  string  $p_str_setting_name  Setting key.
+	 * @return  string
 	 *
 	 * @since  1.5.0
-	 * @param string $p_str_setting_name Name of the Settings key to pre load the input field.
-	 * @return string
+	 * @todo  Refactor HTML generation.
 	 */
 	protected function add_checkbox( $p_str_setting_name ) {
 		// Collect data for given settings field.
@@ -453,21 +489,15 @@ abstract class Footnotes_Layout_Engine {
 	}
 
 	/**
-	 * Returns the html tag for a select box.
+	 * Constructs the HTML for a `<select>` element.
+	 *
+	 * @access  protected
+	 * @param  string  $p_str_setting_name  Setting key.
+	 * @param  array  $p_arr_options  Possible options.
+	 * @return  string
 	 *
 	 * @since  1.5.0
-	 *
-	 * - Bugfix: Dashboard: Referrers and tooltips: Backlink symbol: debug select box by reverting identity check to equality check, thanks to @lolzim bug report.
-	 *
-	 * @reporter @lolzim
-	 *
-	 * @since 2.5.13
-	 * @param string $p_str_setting_name  Name of the Settings key to pre select the current value.
-	 * @param array  $p_arr_options       Possible options to be selected.
-	 * @return string
-	 *
-	 * @since 2.5.15 Bugfix: Dashboard: General settings: Footnote start and end short codes: debug select box for shortcodes with pointy brackets.
-	 * @since 2.6.1  Restore esc_attr() in load_setting(), remove htmlspecialchars() here.
+	 * @todo  Refactor HTML generation.
 	 */
 	protected function add_select_box( $p_str_setting_name, $p_arr_options ) {
 		// Collect data for given settings field.
@@ -495,11 +525,14 @@ abstract class Footnotes_Layout_Engine {
 	}
 
 	/**
-	 * Returns the html tag for a text area.
+	 * Constructs the HTML for a `<textarea>` element.
 	 *
-	 * @since 1.5.0
-	 * @param string $p_str_setting_name Name of the Settings key to pre fill the text area.
-	 * @return string
+	 * @access  protected
+	 * @param  string  $p_str_setting_name  Setting key.
+	 * @return  string
+	 *
+	 * @since  1.5.0
+	 * @todo  Refactor HTML generation.
 	 */
 	protected function add_textarea( $p_str_setting_name ) {
 		// Collect data for given settings field.
@@ -513,11 +546,16 @@ abstract class Footnotes_Layout_Engine {
 	}
 
 	/**
-	 * Returns the html tag for an input [type = text] with color selection class.
+	 * Constructs the HTML for a text `<input>` element with the colour selection
+	 * class.
+	 *
+	 * @access  protected
+	 * @param  string  $p_str_setting_name Setting key.
+	 * @return  string
 	 *
 	 * @since  1.5.6
-	 * @param string $p_str_setting_name Name of the Settings key to pre load the input field.
-	 * @return string
+	 * @todo  Refactor HTML generation.
+	 * @todo  Use proper colorpicker element.
 	 */
 	protected function add_color_selection( $p_str_setting_name ) {
 		// Collect data for given settings field.
@@ -531,17 +569,17 @@ abstract class Footnotes_Layout_Engine {
 	}
 
 	/**
-	 * Returns the html tag for an input [type = num].
+	 * Constructs the HTML for numeric `<input>` element.
+	 *
+	 * @access  protected
+	 * @param  string  $p_str_setting_name Setting key.
+	 * @param  int  $p_in_min  Minimum value.
+	 * @param  int  $p_int_max  Maximum value.
+	 * @param  bool  $p_bool_deci  `true` if float, `false` if integer. Default `false`.
+	 * @return  string
 	 *
 	 * @since  1.5.0
-	 * @param string $p_str_setting_name Name of the Settings key to pre load the input field.
-	 * @param int    $p_in_min Minimum value.
-	 * @param int    $p_int_max Maximum value.
-	 * @param bool   $p_bool_deci  true if 0.1 steps and floating to string, false if integer (default).
-	 * @return string
-	 *
-	 * Edited:
-	 * @since 2.1.4  step argument and number_format() to allow decimals  ..
+	 * @todo  Refactor HTML generation.
 	 */
 	protected function add_num_box( $p_str_setting_name, $p_in_min, $p_int_max, $p_bool_deci = false ) {
 		// Collect data for given settings field.
diff --git a/src/admin/layout/class-footnotes-layout-init.php b/src/admin/layout/class-footnotes-layout-init.php
index 1fac4fd..fc9cb35 100644
--- a/src/admin/layout/class-footnotes-layout-init.php
+++ b/src/admin/layout/class-footnotes-layout-init.php
@@ -1,55 +1,61 @@
 <?php // phpcs:disable WordPress.Security.ValidatedSanitizedInput.InputNotSanitized
 /**
- * Includes the Plugin settings menu.
+ * Admin. Layouts: Footnotes_Layout_Init class
  *
+ * The Admin. Layouts subpackage is composed of the {@see Footnotes_Layout_Engine}
+ * abstract class, which is extended by the {@see Footnotes_Layout_Settings}
+ * sub-class. The subpackage is initialised at runtime by the {@see 
+ * Footnotes_Layout_Init} class.
+ *
+ * @package  footnotes\admin_layout
  * @since  1.5.0
- *
- * @package    footnotes
- * @subpackage admin_layout
+ * @since  2.8.0  Rename file from `init.php` to `class-footnotes-layout-init.php`,
+ *								rename `dashboard/` sub-directory to `layout/`.
  */
 
 /**
- * Handles the Settings interface of the Plugin.
+ * Class to initialise all defined page layouts.
  *
+ * @package  footnotes\admin_layout
  * @since  1.5.0
- *
- * @package    footnotes
- * @subpackage admin_layout
  */
 class Footnotes_Layout_Init {
 
 	/**
 	 * The ID of this plugin.
 	 *
-	 * @since    2.8.0
-	 * @access   private
-	 * @var      string    $plugin_name    The ID of this plugin.
+	 * @access  private
+	 * @var  string  $plugin_name  The ID of this plugin.
+	 *
+	 * @since  2.8.0
 	 */
 	private $plugin_name;
 
 	/**
 	 * Slug for the Plugin main menu.
 	 *
-	 * @since 1.5.0
-	 * @var string
+	 * @var  string
+	 *
+	 * @since  1.5.0
 	 */
 	const C_STR_MAIN_MENU_SLUG = 'footnotes';
 
 	/**
-	 * Contains the settings layoutEngine
+	 * Contains the settings page.
 	 *
-	 * @since 1.5.0
-	 * @var array
+	 * @var  Footnotes_Layout_Settings
+	 *
+	 * @since  1.5.0
 	 */
 	private $settings_page;
 
 	/**
-	 * Class Constructor. Initializes all WordPress hooks for the Plugin Settings.
+	 * Initializes all WordPress hooks for the Plugin Settings.
 	 *
-	 * @param string $plugin_name The name of the plugin.
+	 * @param  string  $plugin_name  The name of the plugin.
 	 *
 	 * @since  1.5.0
-	 * @since 2.8.0 Added `$plugin_name` parameter.
+	 * @since  2.8.0  Added `$plugin_name` parameter.
 	 */
 	public function __construct( $plugin_name ) {
 		$this->plugin_name = $plugin_name;
@@ -65,34 +71,33 @@ class Footnotes_Layout_Init {
 		add_action( 'wp_ajax_nopriv_footnotes_get_plugin_info', array( $this, 'get_plugin_meta_information' ) );
 		add_action( 'wp_ajax_footnotes_get_plugin_info', array( $this, 'get_plugin_meta_information' ) );
 	}
+	
 	/**
-	 * Load the required dependencies for this plugin.
+	 * Load the required dependencies for the layouts pages.
 	 *
 	 * Include the following files that make up the plugin:
 	 *
-	 * - `Footnotes_Config`. Defines constant plugin values.
-	 * - `Footnotes_Settings`. Defines configurable plugin settings.
-	 * - `Footnotes_Layout_Settings`. Defines the plugin settings page.
+	 * - {@see Footnotes_Config}: defines plugin constants;
+	 * - {@see Footnotes_Settings}: defines configurable plugin settings; and
+	 * - {@see Footnotes_Layout_Settings}: defines the plugin settings page.
 	 *
-	 * Create an instance of the loader which will be used to register the hooks
-	 * with WordPress.
+	 * @access  private
 	 *
-	 * @since    2.8.0
-	 * @access   private
+	 * @since  2.8.0
 	 */
 	private function load_dependencies() {
 		/**
-		 * The class responsible for defining plugin constants.
+		 * Defines plugin constants.
 		 */
 		require_once plugin_dir_path( dirname( __FILE__, 2 ) ) . 'includes/class-footnotes-config.php';
 
 		/**
-		 * The class responsible for tracking configurable plugin settings.
+		 * Defines configurable plugin settings.
 		 */
 		require_once plugin_dir_path( dirname( __FILE__, 2 ) ) . 'includes/class-footnotes-settings.php';
 
 		/**
-		 * The class responsible for defining the plugin settings page.
+		 * Represents the plugin settings dashboard page.
 		 */
 		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'layout/class-footnotes-layout-settings.php';
 	}
diff --git a/src/admin/layout/class-footnotes-layout-settings.php b/src/admin/layout/class-footnotes-layout-settings.php
index 7976add..7e0ee9b 100644
--- a/src/admin/layout/class-footnotes-layout-settings.php
+++ b/src/admin/layout/class-footnotes-layout-settings.php
@@ -1,109 +1,84 @@
 <?php // phpcs:disable Squiz.Commenting.FileComment.Missing
 /**
- * Includes the Plugin Class to display all Settings.
+ * Admin. Layouts: Footnotes_Layout_Settings class
  *
- * @since 1.5.0
- * @since 2.0.4  restore arrow settings
- * @since 2.1.0  read-on button label
- * @since 2.1.1  options for ref container and alternative tooltips
- * @since 2.1.1  Referrers: superscript becomes optional, thanks to @cwbayer bug report
- * @since 2.1.2  priority level settings for all other hooks, thanks to @nikelaos
- * @link https://wordpress.org/support/topic/doesnt-work-any-more-11/#post-13676705
- * @since 2.1.4  settings for ref container, tooltips and scrolling
- * @since 2.1.6  slight UI reordering
- * @since 2.1.6  option to disable URL line wrapping
- * @since 2.1.6  remove expert mode setting as outdated
- * @since 2.2.0  start/end short codes: more predefined options, thanks to @nikelaos
- * @link https://wordpress.org/support/topic/doesnt-work-with-mailpoet/
- * @since 2.2.0  add options, redistribute, update strings
- * @since 2.2.0  shortcode for reference container custom position
- * @since 2.2.2  Custom CSS settings container migration
- * @since 2.2.4  move backlink symbol selection under previous tab
- * @since 2.2.5  support for Ibid. notation thanks to @meglio
- * @link https://wordpress.org/support/topic/add-support-for-ibid-notation/
- * @since 2.2.5  options for label element and label bottom border, thanks to @markhillyer
- * @link https://wordpress.org/support/topic/how-do-i-eliminate-the-horizontal-line-beneath-the-reference-container-heading/
- * @since 2.2.10 reference container row border option, thanks to @noobishh
- * @link https://wordpress.org/support/topic/borders-25/
- * @since 2.3.0  Reference container: convert top padding to margin and make it a setting, thanks to @hamshe
- * @link https://wordpress.org/support/topic/reference-container-in-elementor/#post-13786635
- * @since 2.3.0  rename Priority level tab as Scope and priority
- * @since 2.3.0  swap Custom CSS migration Boolean from 'migration complete' to 'show legacy'
- * @since 2.3.0  mention op. cit. abbreviation
- * @since 2.3.0  add settings for hard links, thanks to @psykonevro and @martinneumannat
- * @link https://wordpress.org/support/topic/making-it-amp-compatible/
- * @link https://wordpress.org/support/topic/footnotes-is-not-amp-compatible/
- * @since 2.4.0  footnote shortcode syntax validation
- * @since 2.5.0  Shortcode syntax validation: add more information around the setting, thanks to @andreasra
- * @link https://wordpress.org/support/topic/warning-unbalanced-footnote-start-tag-short-code-before/
+ * The Admin. Layouts subpackage is composed of the {@see Footnotes_Layout_Engine}
+ * abstract class, which is extended by the {@see Footnotes_Layout_Settings}
+ * sub-class. The subpackage is initialised at runtime by the {@see 
+ * Footnotes_Layout_Init} class.
  *
- * @package    footnotes
- * @subpackage admin_layout
+ * @package  footnotes\admin_layout
+ * @since  1.5.0
+ * @since  2.8.0  Rename file from `subpage-main.php` to `class-footnotes-layout-settings.php`,
+ *								rename `dashboard/` sub-directory to `layout/`.
  */
 
+/**
+ * Provides the abstract class to be extended for page layouts.
+ */
 require_once plugin_dir_path( dirname( __FILE__ ) ) . 'layout/class-footnotes-layout-engine.php';
 
 /**
- * Displays and handles all Settings of the Plugin.
+ * Class to initialise all defined page layouts.
  *
- * @since 1.5.0
+ * @since  1.5.0
+ * @package  footnotes\admin_layout
  *
- * @package    footnotes
- * @subpackage admin_layout
+ * @see  Footnotes_Layout_Engine
  */
 class Footnotes_Layout_Settings extends Footnotes_Layout_Engine {
 
 	/**
 	 * Initialize the class and set its properties.
 	 *
-	 * @since    2.8.0
-	 * @param    string $plugin_name       The name of this plugin.
+	 * @since  2.8.0
+	 * @param  string  $plugin_name  The name of this plugin.
 	 */
 	public function __construct( $plugin_name ) {
 		$this->plugin_name = $plugin_name;
 	}
 
 	/**
-	 * Returns a Priority index. Lower numbers have a higher Priority.
+	 * Returns a priority index.
 	 *
-	 * @since 1.5.0
-	 * @return int
+	 * Lower numbers have a higher priority.
+	 *
+	 * @since  1.5.0
+	 * @return  int
 	 */
 	public function get_priority() {
 		return 10;
 	}
 
 	/**
-	 * Returns the unique slug of the sub page.
+	 * Returns the unique slug of the sub-page.
 	 *
-	 * @since 1.5.0
-	 * @return string
+	 * @since  1.5.0
+	 * @return  string
 	 */
 	protected function get_sub_page_slug() {
 		return '-' . $this->plugin_name;
 	}
 
 	/**
-	 * Returns the title of the sub page.
+	 * Returns the title of the sub-page.
 	 *
-	 * @since 1.5.0
-	 * @return string
+	 * @since  1.5.0
+	 * @return  string
 	 */
 	protected function get_sub_page_title() {
 		return Footnotes_Config::C_STR_PLUGIN_PUBLIC_NAME;
 	}
 
 	/**
-	 * Returns an array of all registered sections for the sub page.
+	 * Returns an array of all registered sections for the sub-page.
+	 *
+	 * @see  Footnotes_Layout_Engine::add_section()  For more information on the
+	 *       																			   section array format.
+	 * @return  array[]  All of the registered sections.
 	 *
 	 * @since  1.5.0
-	 * @return array
-	 *
-	 * Edited:
-	 * @since 2.1.6  tabs reordered and renamed
-	 * @link https://www.linkedin.com/pulse/20140610191154-4746170-configuration-vs-customization-when-and-why-would-i-implement-each
-	 *
-	 * @since 2.1.6  removed if statement around expert tab
+	 * @since  2.1.6  Remove conditional rendering of ‘Expert’ tab.
 	 */
 	protected function get_sections() {
 		$l_arr_tabs = array();
@@ -122,25 +97,14 @@ class Footnotes_Layout_Settings extends Footnotes_Layout_Engine {
 	}
 
 	/**
-	 * Returns an array of all registered meta boxes for each section of the sub page.
+	 * Returns an array of all registered meta boxes for each section of the sub-page.
+	 *
+	 * @see  Footnotes_Layout_Engine::add_meta_box()  For more information on the
+	 *       																			    meta box array format.
+	 * @return  array[]  All of the registered meta boxes.
 	 *
 	 * @since  1.5.0
-	 * @return array
-	 *
-	 * Edited for 2.0.0 and later.
-	 *
-	 * hyperlink_arrow meta box:
-	 * @since 2.0.0 discontinued
-	 * @since 2.0.4 restored to meet user demand for arrow symbol semantics
-	 * @since 2.1.4 discontinued, content moved to Settings > Reference container > Display a backlink symbol
-	 *
-	 * @since 2.0.4 to reflect changes in meta box label display since WPv5.5
-	 * spans need position:fixed and become unlocalizable
-	 * fix: logo is kept only in the label that doesn't need to be translated:
-	 * Change string "%s styling" to "Footnotes styling" to fix layout in WPv5.5
-	 * @see details in class/config.php
-	 *
-	 * @since 2.1.6 / 2.2.0 tabs reordered and renamed
+	 * @since  2.2.0  Re-order and rename tabs.
 	 */
 	protected function get_meta_boxes() {
 		$l_arr_meta_boxes = array();
@@ -184,8 +148,7 @@ class Footnotes_Layout_Settings extends Footnotes_Layout_Engine {
 	/**
 	 * Displays the AMP compatibility mode option.
 	 *
-	 * @since 2.5.11 (draft)
-	 * @since 2.6.0  (release)
+	 * @since  2.6.0  (release)
 	 */
 	public function amp_compat() {
 
@@ -212,12 +175,7 @@ class Footnotes_Layout_Settings extends Footnotes_Layout_Engine {
 	/**
 	 * Displays all settings for the reference container.
 	 *
-	 * @since 1.5.0
-	 *
-	 * Completed:
-	 * @since 2.1.4: layout and typography options
-	 * @since 2.2.5  options for label element and label bottom border, thanks to @markhillyer
-	 * @link https://wordpress.org/support/topic/how-do-i-eliminate-the-horizontal-line-beneath-the-reference-container-heading/
+	 * @since  1.5.0
 	 */
 	public function reference_container() {
 
@@ -250,10 +208,12 @@ class Footnotes_Layout_Settings extends Footnotes_Layout_Engine {
 				'semicolon' => __( 'SEMICOLON', 'footnotes' ),
 				'en_dash'   => __( 'EN DASH', 'footnotes' ),
 			);
-			// Options for the terminating punctuation after backlinks.
-			// The Unicode name of RIGHT PARENTHESIS was originally more accurate because.
-			// This character is bidi-mirrored. Let's use the Unicode 1.0 name.
-			// The wrong names were enforced in spite of Unicode, that subsequently scrambled to correct.
+			/*
+			 * Options for the terminating punctuation after backlinks.
+			 * The Unicode name of RIGHT PARENTHESIS was originally more accurate because.
+			 * This character is bidi-mirrored. Let's use the Unicode 1.0 name.
+			 * The wrong names were enforced in spite of Unicode, that subsequently scrambled to correct.
+			 */
 			$l_arr_terminators = array(
 				'period'      => __( 'FULL STOP', 'footnotes' ),
 				// Unicode 1.0 name of RIGHT PARENTHESIS (represented as a left parenthesis in right-to-left scripts).
@@ -389,18 +349,7 @@ class Footnotes_Layout_Settings extends Footnotes_Layout_Engine {
 	/**
 	 * Displays all options for the footnotes start and end tag short codes.
 	 *
-	 * @since 1.5.0
-	 *
-	 * Edited heading
-	 * @since 2.2.0  start/end short codes: more predefined options
-	 * @link https://wordpress.org/support/topic/doesnt-work-with-mailpoet/
-	 * @since 2.2.0  3 boxes for clarity
-	 * @since 2.2.5  support for Ibid. notation thanks to @meglio
-	 * @link https://wordpress.org/support/topic/add-support-for-ibid-notation/
-	 * @since 2.4.0  added warning about Block Editor escapement disruption
-	 * @since 2.4.0  removed the HTML comment tag option
-	 * @since 2.5.0  Shortcode syntax validation: add more information around the setting, thanks to @andreasra
-	 * @link https://wordpress.org/support/topic/warning-unbalanced-footnote-start-tag-short-code-before/
+	 * @since  1.5.0
 	 */
 	public function start_end() {
 		// Footnotes start tag short code options.
@@ -477,7 +426,7 @@ class Footnotes_Layout_Settings extends Footnotes_Layout_Engine {
 	/**
 	 * Displays all options for the footnotes numbering.
 	 *
-	 * @since 2.2.0
+	 * @since  2.2.0
 	 */
 	public function numbering() {
 		// Define some space for the output.
@@ -522,7 +471,7 @@ class Footnotes_Layout_Settings extends Footnotes_Layout_Engine {
 	/**
 	 * Displays all options for the scrolling behavior.
 	 *
-	 * @since 2.2.0
+	 * @since  2.2.0
 	 */
 	public function scrolling() {
 
@@ -578,8 +527,7 @@ class Footnotes_Layout_Settings extends Footnotes_Layout_Engine {
 	/**
 	 * Displays all options for the fragment identifier configuration.
 	 *
-	 * @since 2.2.0  in scrolling().
-	 * @since 2.5.12 separate metabox.
+	 * @since  2.2.0
 	 */
 	public function hard_links() {
 
@@ -629,13 +577,9 @@ class Footnotes_Layout_Settings extends Footnotes_Layout_Engine {
 	}
 
 	/**
-	 * Displays all settings for 'I love Footnotes'.
+	 * Displays all settings for ‘I love Footnotes’ note.
 	 *
-	 * @since 1.5.0
-	 *
-	 * Edited:
-	 * @since 2.2.0  position-sensitive placeholders to support more locales
-	 * @since 2.2.0  more options
+	 * @since  1.5.0
 	 */
 	public function love() {
 		// Options for the acknowledgment display in the footer.
@@ -681,13 +625,7 @@ class Footnotes_Layout_Settings extends Footnotes_Layout_Engine {
 	/**
 	 * Displays the footnotes in excerpt setting.
 	 *
-	 * @since 1.5.0
-	 *
-	 * Edited heading
-	 * @since 2.1.1   more settings and notices, thanks to @nikelaos
-	 * @link https://wordpress.org/support/topic/doesnt-work-any-more-11/#post-13687068
-	 * @link https://wordpress.org/support/topic/jquery-comes-up-in-feed-content/#post-13110879
-	 * @since 2.2.0   dedicated to the excerpt setting and its notices
+	 * @since  1.5.0
 	 */
 	public function excerpts() {
 		// Options for options select box.
@@ -719,11 +657,7 @@ class Footnotes_Layout_Settings extends Footnotes_Layout_Engine {
 	/**
 	 * Displays all settings for the footnote referrers.
 	 *
-	 * @since 1.5.0
-	 *
-	 * Edited heading
-	 * @since 2.1.1  option for superscript (optionally baseline referrers)
-	 * @since 2.2.0  option for link element moved here
+	 * @since  1.5.0
 	 */
 	public function superscript() {
 		// Options for Yes/No select box.
@@ -768,7 +702,7 @@ class Footnotes_Layout_Settings extends Footnotes_Layout_Engine {
 	/**
 	 * Displays the setting for the input label issue solution.
 	 *
-	 * @since 2.5.12
+	 * @since  2.5.12
 	 */
 	public function label_solution() {
 		// Options for the input label issue solution.
@@ -797,11 +731,7 @@ class Footnotes_Layout_Settings extends Footnotes_Layout_Engine {
 	/**
 	 * Displays enabled status for the footnotes mouse-over box.
 	 *
-	 * @since 1.5.2
-	 *
-	 * Edited:
-	 * @since 2.2.0   5 parts to address increased settings number
-	 * @since 2.2.5   position settings for alternative tooltips
+	 * @since  1.5.2
 	 */
 	public function mouseover_box() {
 		// Options for Yes/No select box.
@@ -837,7 +767,7 @@ class Footnotes_Layout_Settings extends Footnotes_Layout_Engine {
 	/**
 	 * Displays position settings for the footnotes mouse-over box.
 	 *
-	 * @since 2.2.0
+	 * @since  2.2.0
 	 */
 	public function mouseover_box_position() {
 
@@ -892,7 +822,7 @@ class Footnotes_Layout_Settings extends Footnotes_Layout_Engine {
 	/**
 	 * Displays dimensions setting for the footnotes mouse-over box.
 	 *
-	 * @since 2.2.0
+	 * @since  2.2.0
 	 */
 	public function mouseover_box_dimensions() {
 
@@ -918,7 +848,7 @@ class Footnotes_Layout_Settings extends Footnotes_Layout_Engine {
 	/**
 	 * Displays timing settings for the footnotes mouse-over box.
 	 *
-	 * @since 2.2.0
+	 * @since  2.2.0
 	 */
 	public function mouseover_box_timing() {
 
@@ -955,7 +885,7 @@ class Footnotes_Layout_Settings extends Footnotes_Layout_Engine {
 	/**
 	 * Displays truncation settings for the footnotes mouse-over box.
 	 *
-	 * @since 2.2.0
+	 * @since  2.2.0
 	 */
 	public function mouseover_box_truncation() {
 		// Options for Yes/No select box.
@@ -992,7 +922,7 @@ class Footnotes_Layout_Settings extends Footnotes_Layout_Engine {
 	/**
 	 * Displays dedicated tooltip text settings for the footnotes mouse-over box.
 	 *
-	 * @since 2.2.0
+	 * @since  2.2.0
 	 */
 	public function mouseover_box_text() {
 		// Options for Yes/No select box.
@@ -1034,7 +964,7 @@ class Footnotes_Layout_Settings extends Footnotes_Layout_Engine {
 	/**
 	 * Displays style settings for the footnotes mouse-over box.
 	 *
-	 * @since 2.2.0
+	 * @since  2.2.0
 	 */
 	public function mouseover_box_appearance() {
 		// Options for Yes/No select box.
@@ -1104,26 +1034,7 @@ class Footnotes_Layout_Settings extends Footnotes_Layout_Engine {
 	/**
 	 * Displays all settings for the backlink symbol.
 	 *
-	 * @since 1.5.0
-	 *
-	 * - Update: **symbol for backlinks** removed; hyperlink moved to the reference number.
-	 *
-	 * @since 2.0.0
-	 * The former 'hyperlink arrow' is incompatible with combined identical footnotes.
-	 *
-	 * - Update: Reference container: clarify backlink semantics by prepended transitional up arrow, thanks to @mmallett issue report.
-	 *
-	 * @since 2.0.3
-	 *
-	 * - Update: Restore arrow settings to customize or disable the now prepended arrow symbol, thanks to @mmallett issue report.
-	 *
-	 * @since 2.0.4
-	 *
-	 * @reporter @mmallett
-	 * @link https://wordpress.org/support/topic/mouse-over-broken/#post-13593037
-	 *
-	 * @since 2.1.4  moved to Settings > Reference container > Display a backlink symbol
-	 * @since 2.2.1 and 2.2.4  back here
+	 * @since  1.5.0
 	 */
 	public function hyperlink_arrow() {
 		// Load template file.
@@ -1147,16 +1058,7 @@ class Footnotes_Layout_Settings extends Footnotes_Layout_Engine {
 	/**
 	 * Displays the Custom CSS box.
 	 *
-	 * @since 1.5.0
-	 *
-	 * Edited:
-	 * @since 2.1.6  drop localized notices for CSS classes as the number increased to 16
-	 *        list directly in the template, as CSS is in English anyway
-	 * @link ../partials/customize-css.html
-	 *
-	 * @since 2.2.2  migrate Custom CSS to a dedicated tab
-	 * @since 2.3.0  say 'copy-paste' instead of 'cut and paste' since cutting is not needed
-	 * @since 2.5.1  mention validity while visible, thanks to @rkupadhya bug report
+	 * @since  1.5.0
 	 */
 	public function custom_css() {
 		// Load template file.
@@ -1195,7 +1097,8 @@ class Footnotes_Layout_Settings extends Footnotes_Layout_Engine {
 	/**
 	 * Displays transitional legacy Custom CSS box.
 	 *
-	 * @since 2.2.2
+	 * @since  2.2.2
+	 * @deprecated
 	 */
 	public function custom_css_migration() {
 
@@ -1231,7 +1134,7 @@ class Footnotes_Layout_Settings extends Footnotes_Layout_Engine {
 	/**
 	 * Displays the new Custom CSS box.
 	 *
-	 * @since 2.2.2
+	 * @since  2.2.2
 	 */
 	public function custom_css_new() {
 		// Load template file.
@@ -1254,20 +1157,14 @@ class Footnotes_Layout_Settings extends Footnotes_Layout_Engine {
 	/**
 	 * Displays available Hooks to look for Footnote short codes.
 	 *
-	 * @since 1.5.5
+	 * Priority level was initially a hard-coded default
+	 * shows ‘9223372036854775807’ in the numbox
+	 * empty should be interpreted as `PHP_INT_MAX`,
+	 * but a numbox cannot be set to empty, see {@link https://github.com/Modernizr/Modernizr/issues/171
+	 * here}
+	 * define -1 as `PHP_INT_MAX` instead
 	 *
-	 * Edited:
-	 * @since 2.1.1  priority level setting for the_content
-	 * @since 2.1.4  priority level settings for the other hooks
-	 *
-	 * priority level was initially hard-coded default
-	 * shows "9223372036854775807" in the numbox
-	 * empty should be interpreted as PHP_INT_MAX,
-	 * but a numbox cannot be set to empty: <https://github.com/Modernizr/Modernizr/issues/171>
-	 * define -1 as PHP_INT_MAX instead
-	 *
-	 * @since 2.2.9  removed the warning about the widget text hook
-	 * @since 2.2.9  added guidance for the widget text hook
+	 * @since  1.5.5
 	 */
 	public function lookup_hooks() {
 		// Load template file.
@@ -1321,12 +1218,9 @@ class Footnotes_Layout_Settings extends Footnotes_Layout_Engine {
 	}
 
 	/**
-	 * Displays a short introduction to the Plugin.
+	 * Displays a short introduction to the plugin.
 	 *
-	 * @since 1.5.0
-	 *
-	 * @since 2.7.0  Sanitize Lorem Ipsum filler text.
-	 * @link https://blog.prototypr.io/why-testing-with-real-content-is-better-than-lorem-ipsum-c7c79586ee72
+	 * @since  1.5.0
 	 */
 	public function Help() {
 		global $footnotes;
@@ -1371,19 +1265,13 @@ class Footnotes_Layout_Settings extends Footnotes_Layout_Engine {
 			)
 		);
 
-		/**
-		 * Call footnotes_output_head function to get the Styling of the mouse-over box.
+		/*
+		 * Call {@see Footnotes_Parser::footnotes_output_head()} function to get 
+		 * the styling of the mouse-over box.
 		 *
-		 * - Bugfix: Dashboard: debug the 'Quick start guide' tab, thanks to @rumperuu bug report.
-		 *
-		 * @reporter @rumperuu
-		 * @link https://github.com/markcheret/footnotes/issues/71
-		 *
-		 * @since 2.7.0
 		 * The name of the callback function ought to be distinct from
 		 * the name of the filtered function.
 		 * When this callback function was renamed, this call went unnoticed.
-		 * @see class/task.php
 		 */
 		$footnotes->a_obj_task->footnotes_output_head();
 
@@ -1396,7 +1284,7 @@ class Footnotes_Layout_Settings extends Footnotes_Layout_Engine {
 	/**
 	 * Displays all Donate button to support the developers.
 	 *
-	 * @since 1.5.0
+	 * @since  1.5.0
 	 */
 	public function donate() {
 		// Load template file.
diff --git a/src/includes/class-footnotes-config.php b/src/includes/class-footnotes-config.php
index d952ccd..c128137 100644
--- a/src/includes/class-footnotes-config.php
+++ b/src/includes/class-footnotes-config.php
@@ -6,7 +6,8 @@
  * @subpackage  includes
  *
  * @since  1.5.0
- * @since  2.8.0  Rename file from `config.php` to `class-footnotes-config.php`.
+ * @since  2.8.0  Rename file from `config.php` to `class-footnotes-config.php`,
+ *								rename `class/` sub-directory to `includes/`.
  * @todo  Remove.
  * @deprecated
  */
@@ -16,6 +17,9 @@
  *
  * This class contains no methods of properties.
  *
+ * @package  footnotes
+ * @subpackage  includes
+ *
  * @since  1.5.0
  * @todo  Remove.
  * @deprecated
diff --git a/src/includes/class-footnotes-convert.php b/src/includes/class-footnotes-convert.php
index e307fff..37772de 100644
--- a/src/includes/class-footnotes-convert.php
+++ b/src/includes/class-footnotes-convert.php
@@ -6,12 +6,16 @@
  * @subpackage  includes
  *
  * @since  1.5.0
- * @since  2.8.0  Rename file from `convert.php` to `class-footnotes-convert.php`.
+ * @since  2.8.0  Rename file from `convert.php` to `class-footnotes-convert.php`,
+ *								rename `class/` sub-directory to `includes/`.
  */
 
 /**
  * Class providing variable type and value conversion functions.
  *
+ * @package  footnotes
+ * @subpackage  includes
+ *
  * @since 1.5.0
  */
 class Footnotes_Convert {
diff --git a/src/includes/class-footnotes-i18n.php b/src/includes/class-footnotes-i18n.php
index e43eb8a..f93a72c 100644
--- a/src/includes/class-footnotes-i18n.php
+++ b/src/includes/class-footnotes-i18n.php
@@ -6,7 +6,8 @@
  * @subpackage  includes
  *
  * @since  1.5.0
- * @since  2.8.0  Rename file from `language.php` to `class-footnotes-i18n.php`.
+ * @since  2.8.0  Rename file from `language.php` to `class-footnotes-i18n.php`,
+ *								rename `class/` sub-directory to `includes/`.
  */
 
 require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-footnotes-config.php';
diff --git a/src/includes/class-footnotes-loader.php b/src/includes/class-footnotes-loader.php
index efe0dc8..64078a8 100644
--- a/src/includes/class-footnotes-loader.php
+++ b/src/includes/class-footnotes-loader.php
@@ -2,7 +2,7 @@
 /**
  * File providing the `Footnotes_Loader` class.
  *
- * @package footnotes
+ * @package  footnotes
  * @subpackage  includes
  *
  * @since 2.8.0
diff --git a/src/includes/class-footnotes-settings.php b/src/includes/class-footnotes-settings.php
index 02189ec..2b01aa0 100644
--- a/src/includes/class-footnotes-settings.php
+++ b/src/includes/class-footnotes-settings.php
@@ -1,14 +1,13 @@
 <?php // phpcs:disable Squiz.Commenting.FileComment.Missing
 /**
- * Includes the Settings class to handle all Plugin settings.
- *
- * The constants are ordered by ascending version so their docblocks can replace most of this list.
+ * File providing the `Footnotes_Setting` class.
  *
  * @package  footnotes
  * @subpackage  includes
  *
  * @since  1.5.0
- * @since  2.8.0  Rename file from `settings.php` to `class-footnotes-settings.php`.
+ * @since  2.8.0  Rename file from `settings.php` to `class-footnotes-settings.php`,
+ *								rename `class/` sub-directory to `includes/`.
  */
 
 require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-footnotes-convert.php';
@@ -16,6 +15,9 @@ require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-footnotes-
 /**
  * Class defining configurable plugin settings.
  *
+ * @package  footnotes
+ * @subpackage  includes
+ *
  * @since  1.5.0
  */
 class Footnotes_Settings {
@@ -23,7 +25,7 @@ class Footnotes_Settings {
 	/**
 	 * Settings container key for the label of the reference container.
 	 *
-	 * @var  str
+	 * @var  string
 	 *
 	 * @since  1.5.0
 	 */
@@ -34,7 +36,7 @@ class Footnotes_Settings {
 	 *
 	 * The string is converted to Boolean false if 'no', true if 'yes'.
 	 *
-	 * @var  str
+	 * @var  string
 	 *
 	 * @since  1.5.0
 	 * @todo  Refactor to use sane typing.
@@ -44,7 +46,7 @@ class Footnotes_Settings {
 	/**
 	 * Settings container key for the position of the reference container.
 	 *
-	 * @var  str
+	 * @var  string
 	 *
 	 * @since  1.5.0
 	 */
@@ -53,7 +55,7 @@ class Footnotes_Settings {
 	/**
 	 * Settings container key for combining identical footnotes.
 	 *
-	 * @var  str
+	 * @var  string
 	 *
 	 * @since  1.5.0
 	 */
@@ -62,7 +64,7 @@ class Footnotes_Settings {
 	/**
 	 * Settings container key for the short code of the footnote's start.
 	 *
-	 * @var  str
+	 * @var  string
 	 *
 	 * @since  1.5.0
 	 */
@@ -71,7 +73,7 @@ class Footnotes_Settings {
 	/**
 	 * Settings container key for the short code of the footnote's end.
 	 *
-	 * @var  str
+	 * @var  string
 	 *
 	 * @since  1.5.0
 	 */
@@ -80,7 +82,7 @@ class Footnotes_Settings {
 	/**
 	 * Settings container key for the user-defined short code of the footnotes start.
 	 *
-	 * @var  str
+	 * @var  string
 	 *
 	 * @since  1.5.0
 	 */
@@ -89,7 +91,7 @@ class Footnotes_Settings {
 	/**
 	 * Settings container key for the user-defined short code of the footnotes end.
 	 *
-	 * @var  str
+	 * @var  string
 	 *
 	 * @since  1.5.0
 	 */
@@ -98,7 +100,7 @@ class Footnotes_Settings {
 	/**
 	 * Settings container key for the counter style of the footnotes.
 	 *
-	 * @var  str
+	 * @var  string
 	 *
 	 * @since  1.5.0
 	 */
@@ -107,622 +109,550 @@ class Footnotes_Settings {
 	/**
 	 * Settings container key for the backlink symbol selection.
 	 *
-	 * @since 1.5.0
+	 * @var  string
 	 *
-	 * - Update: Restore arrow settings to customize or disable the now prepended arrow symbol, thanks to @mmallett issue report.
-	 *
-	 * @reporter @mmallett
-	 * @link https://wordpress.org/support/topic/mouse-over-broken/#post-13593037
-	 *
-	 * @since 2.0.4
-	 * @var str
+	 * @since  1.5.0
 	 */
 	const C_STR_HYPERLINK_ARROW = 'footnote_inputfield_custom_hyperlink_symbol';
 
 	/**
 	 * Settings container key for the user-defined backlink symbol.
 	 *
-	 * @since 1.5.0
-	 * @var str
+	 * @var  string
+	 *
+	 * @since  1.5.0
 	 */
 	const C_STR_HYPERLINK_ARROW_USER_DEFINED = 'footnote_inputfield_custom_hyperlink_symbol_user';
 
 	/**
 	 * Settings container key to look for footnotes in post excerpts.
 	 *
-	 * @since 1.5.0
-	 * @since 2.6.2  Debug No option.
-	 * @since 2.6.3  Enable by default after debugging both Yes and No options.
+	 * @see  C_STR_EXPERT_LOOKUP_THE_EXCERPT
+	 * @var  string
 	 *
-	 * - Bugfix: Excerpts: make excerpt handling backward compatible, thanks to @mfessler bug report.
-	 *
-	 * @reporter @mfessler
-	 * @link https://github.com/markcheret/footnotes/issues/65
-	 *
-	 * @since 2.7.0
-	 * @see C_STR_EXPERT_LOOKUP_THE_EXCERPT
-	 * @var str  Default 'manual'.
+	 * @since  1.5.0
+	 * @since  2.6.3  Enabled by default.
 	 */
 	const C_STR_FOOTNOTES_IN_EXCERPT = 'footnote_inputfield_search_in_excerpt';
 
 	/**
 	 * Settings container key for the string before the footnote referrer.
 	 *
-	 * @since 1.5.0
-	 * @var str
+	 * The default footnote referrer surroundings should be square brackets, as 
+	 * in English or US American typesetting, for better UX thanks to a more 
+	 * button-like appearance, as well as for stylistic consistency with the
+	 * expand-collapse button.
 	 *
-	 * The default footnote referrer surroundings should be square brackets.
+	 * @var  string
 	 *
-	 * - with respect to baseline footnote referrers new option;
-	 * - as in English or US American typesetting;
-	 * - for better UX thanks to a more button-like appearance;
-	 * - for stylistic consistency with the expand-collapse button.
+	 * @since  1.5.0
 	 */
 	const C_STR_FOOTNOTES_STYLING_BEFORE = 'footnote_inputfield_custom_styling_before';
 
 	/**
 	 * Settings container key for the string after the footnote referrer.
 	 *
-	 * @since 1.5.0
-	 * @var str
+	 * @var  string
+	 *
+	 * @since  1.5.0
 	 */
 	const C_STR_FOOTNOTES_STYLING_AFTER = 'footnote_inputfield_custom_styling_after';
 
 	/**
 	 * Settings container key for the Custom CSS.
 	 *
-	 * @since 1.5.0
-	 * @var str
+	 * @var  string
 	 *
-	 * @since 1.3.0  Adding: new settings tab for custom CSS settings.
+	 * @since  1.5.0
 	 */
 	const C_STR_CUSTOM_CSS = 'footnote_inputfield_custom_css';
 
 	/**
-	 * Settings container key for the 'I love footnotes' text.
+	 * Settings container key for the ‘I love footnotes’ text.
 	 *
-	 * @since 1.5.0
-	 * @var str
+	 * @var  string
+	 *
+	 * @since  1.5.0
 	 */
 	const C_STR_FOOTNOTES_LOVE = 'footnote_inputfield_love';
 
 	/**
 	 * Settings container key to enable the mouse-over box.
 	 *
-	 * @since 1.5.2
-	 * @var str
+	 * @var  string
+	 *
+	 * @since  1.5.2
 	 */
 	const C_STR_FOOTNOTES_MOUSE_OVER_BOX_ENABLED = 'footnote_inputfield_custom_mouse_over_box_enabled';
 
 	/**
 	 * Settings container key to enable tooltip truncation.
 	 *
-	 * @since 1.5.4
-	 * @var str
+	 * @var  string
 	 *
-	 * The mouse over content truncation should be enabled by default
-	 * to raise awareness of the functionality and to prevent the screen
-	 * from being filled at mouse-over, and to allow the Continue reading.
+	 * @since  1.5.4
+	 * @todo  The mouse-over content truncation should be enabled by default to raise 
+	 * 				awareness of the functionality, prevent the screen from being filled on
+	 * 				mouse-over, and allow the use of ‘Continue Reading’ functionality.
 	 */
 	const C_STR_FOOTNOTES_MOUSE_OVER_BOX_EXCERPT_ENABLED = 'footnote_inputfield_custom_mouse_over_box_excerpt_enabled';
 
 	/**
-	 * Settings container key for the mouse-over box to define the max. length of the enabled excerpt.
+	 * Settings container key for the mouse-over box to define the max. length of 
+	 * the enabled excerpt.
 	 *
-	 * @since 1.5.4
-	 * @var int
+	 * The default truncation length is 200 chars.
 	 *
-	 * @since 2.0.7  Increase default truncation length from 150 to 200 chars.
+	 * @var  int
+	 *
+	 * @since  1.5.4
 	 */
 	const C_INT_FOOTNOTES_MOUSE_OVER_BOX_EXCERPT_LENGTH = 'footnote_inputfield_custom_mouse_over_box_excerpt_length';
 
 	/**
-	 * Settings container key to enable the 'the_title' hook.
+	 * Settings container key to enable the `the_title` hook.
 	 *
-	 * @since 1.5.5
-	 * @var str
+	 * These are checkboxes; the keyword `checked` is converted to `true`, whilst
+	 * an empty string (the default) is converted to `false`.
 	 *
-	 * These are checkboxes; keyword 'checked' is converted to Boolean true,
-	 * empty string to false (default).
+	 * Hooks should all be enabled by default to prevent users from thinking at 
+	 * first that the feature is broken in post titles (see {@link 
+	 * https://wordpress.org/support/topic/more-feature-ideas/ here} for more
+	 * information).
 	 *
-	 * Hooks should all be enabled by default to prevent users from
-	 * thinking at first that the feature is broken in post titles.
-	 * @link https://wordpress.org/support/topic/more-feature-ideas/
+	 * @var  string
 	 *
-	 * Yet in titles, footnotes are still buggy, because WordPress
-	 * uses the title string in menus and in the title element, but
-	 * Footnotes doesn’t delete footnotes therein.
+	 * @since  1.5.5
+	 * @todo  In titles, footnotes are still buggy, because WordPress uses the 
+	 * 				title string in menus and in the title element, but Footnotes doesn't 
+	 * 				delete footnotes in them.
 	 */
 	const C_STR_EXPERT_LOOKUP_THE_TITLE = 'footnote_inputfield_expert_lookup_the_title';
 
 	/**
-	 * Settings container key to enable the 'the_content' hook.
+	 * Settings container key to enable the `the_content` hook.
 	 *
-	 * @since 1.5.5
-	 * @var str
+	 * @var  string
+	 *
+	 * @since  1.5.5
 	 */
 	const C_STR_EXPERT_LOOKUP_THE_CONTENT = 'footnote_inputfield_expert_lookup_the_content';
 
 	/**
-	 * Settings container key to enable the 'the_excerpt' hook.
+	 * Settings container key to enable the `the_excerpt` hook.
 	 *
-	 * @since 1.5.5
+	 * @var  string
 	 *
-	 * - Bugfix: Hooks: disable the_excerpt hook by default to fix issues, thanks to @nikelaos bug report.
-	 *
-	 * @reporter @nikelaos
-	 * @link https://wordpress.org/support/topic/doesnt-work-any-more-11/#post-13687068
-	 * @link https://wordpress.org/support/topic/jquery-comes-up-in-feed-content/#post-13110879
-	 * @link https://wordpress.org/support/topic/doesnt-work-any-more-11/#post-13687068
-	 *
-	 * @since 2.1.3
-	 * @since 2.6.3  Enable by default after debugging the 'Footnotes in excerpts' setting.
-	 *
-	 * - Bugfix: Hooks: default-disable the_excerpt hook with respect to theme-specific excerpt handling, thanks to @mmallett bug reports.
-	 *
-	 * @reporter @mmallett
-	 * @link https://wordpress.org/support/topic/broken-662/
-	 * @link https://wordpress.org/support/topic/update-crashed-my-website-3/#post-14260969
-	 *
-	 * @since 2.6.5
 	 * @see C_STR_FOOTNOTES_IN_EXCERPT
-	 * @var str
+	 *
+	 * @since  1.5.5
+	 * @since  2.6.3  Enable by default.
 	 */
 	const C_STR_EXPERT_LOOKUP_THE_EXCERPT = 'footnote_inputfield_expert_lookup_the_excerpt';
 
 	/**
-	 * Settings container key to enable the 'widget_title' hook.
+	 * Settings container key to enable the `widget_title` hook.
 	 *
-	 * @since 1.5.5
-	 * @var str
+	 * @var  string
+	 *
+	 * @since  1.5.5
 	 */
 	const C_STR_EXPERT_LOOKUP_WIDGET_TITLE = 'footnote_inputfield_expert_lookup_widget_title';
 
 	/**
-	 * Settings container key to enable the 'widget_text' hook.
+	 * Settings container key to enable the `widget_text` hook.
 	 *
-	 * @since 1.5.5
-	 * @var str
-	 *
-	 * The widget_text hook must be disabled by default, because it causes
+	 * The `widget_text` hook must be disabled by default, because it causes
 	 * multiple reference containers to appear in Elementor accordions, but
 	 * it must be enabled if multiple reference containers are desired, as
 	 * in Elementor toggles.
+	 *
+	 * @var  string
+	 *
+	 * @since  1.5.5
 	 */
 	const C_STR_EXPERT_LOOKUP_WIDGET_TEXT = 'footnote_inputfield_expert_lookup_widget_text';
 
 	/**
 	 * Settings container key for the Expert mode.
 	 *
-	 * @since 1.5.5
-	 * @var str
-	 *
-	 * @since 2.1.6  This setting removed as irrelevant since priority level settings need permanent visibility.
-	 *
-	 * Since the removal of the the_post hook, the tab is no danger zone any longer.
+	 * Since the removal of the `the_post` hook, the tab is no danger zone any longer.
 	 * All users, not experts only, need to be able to control relative positioning.
+	 *
+	 * @var  string
+	 *
+	 * @since  1.5.5
+	 * @since  2.1.6  Setting deprecated.
+	 * @deprecated
+	 * @todo  Un-deprecate.
 	 */
 	const C_STR_FOOTNOTES_EXPERT_MODE = 'footnote_inputfield_enable_expert_mode';
 
 	/**
 	 * Settings container key for the mouse-over box to define the color.
 	 *
-	 * @since 1.5.6
+	 * @var  string
 	 *
-	 * - Bugfix: Tooltips: Styling: Font color: set to black for maximum contrast with respect to white default background, thanks to 4msc bug report.
-	 *
-	 * @reporter @4msc
-	 * @link https://wordpress.org/support/topic/tooltip-not-showing-on-dark-theme-with-white-text/
-	 *
-	 * @since 2.6.1
 	 * @see C_STR_FOOTNOTES_MOUSE_OVER_BOX_BACKGROUND
-	 * @var str
+	 *
+	 * @since  1.5.6
 	 */
 	const C_STR_FOOTNOTES_MOUSE_OVER_BOX_COLOR = 'footnote_inputfield_custom_mouse_over_box_color';
 
 	/**
 	 * Settings container key for the mouse-over box to define the background color.
 	 *
-	 * @since 1.5.6
-	 * @since 1.2.5..1.5.5  #fff7a7 hard-coded.
-	 * @since 1.5.6..2.0.6  #fff7a7 setting default.
-	 * The mouse over box shouldn’t feature a colored background.
-	 * By default, due to diverging user preferences. White is neutral.
-	 * @since 2.0.7..2.5.10 #ffffff setting default.
+	 * Theme default background color is best, but theme default background color 
+	 * doesn't seem to exist.
 	 *
-	 * - Bugfix: Tooltips: Styling: Background color: empty default value to adopt theme background, thanks to 4msc bug report.
+	 * The default is currently `#ffffff` with `#000000` as the text color.
 	 *
-	 * @reporter @4msc
-	 * @link https://wordpress.org/support/topic/tooltip-not-showing-on-dark-theme-with-white-text/
+	 * @var  string
 	 *
-	 * @since 2.5.11
-	 * Theme default background color is best.
-	 * But theme default background color doesn’t seem to exist.
-	 * @link https://wordpress.org/support/topic/problem-with-footnotes-in-excerpts-of-the-blog-page/#post-14241849
-	 * @since 2.6.1  default #ffffff again along with #000000 as font color.
 	 * @see C_STR_FOOTNOTES_MOUSE_OVER_BOX_COLOR
-	 * @var str
+	 *
+	 * @since  1.5.6
 	 */
 	const C_STR_FOOTNOTES_MOUSE_OVER_BOX_BACKGROUND = 'footnote_inputfield_custom_mouse_over_box_background';
 
 	/**
 	 * Settings container key for the mouse-over box to define the border width.
 	 *
-	 * @since 1.5.6
-	 * @var int
+	 * @var  int
+	 *
+	 * @since  1.5.6
 	 */
 	const C_INT_FOOTNOTES_MOUSE_OVER_BOX_BORDER_WIDTH = 'footnote_inputfield_custom_mouse_over_box_border_width';
 
 	/**
 	 * Settings container key for the mouse-over box to define the border color.
 	 *
-	 * @since 1.5.6
-	 * @var str
+	 * @var  string
+	 *
+	 * @since  1.5.6
 	 */
 	const C_STR_FOOTNOTES_MOUSE_OVER_BOX_BORDER_COLOR = 'footnote_inputfield_custom_mouse_over_box_border_color';
 
 	/**
 	 * Settings container key for the mouse-over box to define the border radius.
 	 *
-	 * @since 1.5.6
-	 * @var int
+	 * @var  int
 	 *
-	 * @since 2.0.7  The mouse over box corners mustn’t be rounded as that is outdated.
+	 * @since  1.5.6
 	 */
 	const C_INT_FOOTNOTES_MOUSE_OVER_BOX_BORDER_RADIUS = 'footnote_inputfield_custom_mouse_over_box_border_radius';
 
 	/**
 	 * Settings container key for the mouse-over box to define the max. width.
 	 *
-	 * @since 1.5.6
-	 * @var int
-	 *
-	 * @since 2.0.7  Set default width 450.
 	 * The width should be limited to start with, for the box to have shape.
+	 *
+	 * The default width is 450.
+	 *
+	 * @var  int
+	 *
+	 * @since  1.5.6
 	 */
 	const C_INT_FOOTNOTES_MOUSE_OVER_BOX_MAX_WIDTH = 'footnote_inputfield_custom_mouse_over_box_max_width';
 
 	/**
 	 * Settings container key for the mouse-over box to define the position.
 	 *
-	 * @since 1.5.7
-	 * @var str
-	 *
 	 * The default position should not be lateral because of the risk
 	 * the box gets squeezed between note anchor at line end and window edge,
 	 * and top because reading at the bottom of the window is more likely.
+	 *
+	 * @var  string
+	 *
+	 * @since  1.5.7
 	 */
 	const C_STR_FOOTNOTES_MOUSE_OVER_BOX_POSITION = 'footnote_inputfield_custom_mouse_over_box_position';
 
 	/**
-	 * Settings container key for the mouse-over box to define the offset (x).
+	 * Settings container key for the mouse-over box to define the _x_-offset.
 	 *
-	 * @since 1.5.7
-	 * @var int
+	 * @var  int
+	 *
+	 * @since  1.5.7
 	 */
 	const C_INT_FOOTNOTES_MOUSE_OVER_BOX_OFFSET_X = 'footnote_inputfield_custom_mouse_over_box_offset_x';
 
 	/**
-	 * Settings container key for the mouse-over box to define the offset (y).
+	 * Settings container key for the mouse-over box to define the _y_-offset.
 	 *
-	 * @since 1.5.7
-	 * @var int
+	 * The vertical offset must be negative for the box not to cover the current 
+	 * line of text.
 	 *
-	 * The vertical offset must be negative for the box not to cover
-	 * The current line of text (web coordinates origin is top left).
+	 * @var  int
+	 *
+	 * @since  1.5.7
 	 */
 	const C_INT_FOOTNOTES_MOUSE_OVER_BOX_OFFSET_Y = 'footnote_inputfield_custom_mouse_over_box_offset_y';
 
 	/**
 	 * Settings container key for the mouse-over box to define the box-shadow color.
 	 *
-	 * @since 1.5.8
-	 * @var str
+	 * @var  string
+	 *
+	 * @since  1.5.8
 	 */
 	const C_STR_FOOTNOTES_MOUSE_OVER_BOX_SHADOW_COLOR = 'footnote_inputfield_custom_mouse_over_box_shadow_color';
 
 	/**
 	 * Settings container key for the label of the Read-on button in truncated tooltips.
 	 *
-	 * - Adding: Tooltips: Read-on button: Label: configurable instead of localizable, thanks to @rovanov example provision.
+	 * @var  string
 	 *
-	 * @reporter @rovanov
-	 * @link https://wordpress.org/support/topic/offset-x-axis-and-offset-y-axis-does-not-working/
-	 *
-	 * @since 2.1.0
-	 * @var str
+	 * @since  2.1.0
 	 */
 	const C_STR_FOOTNOTES_TOOLTIP_READON_LABEL = 'footnote_inputfield_readon_label';
 
 	/**
 	 * Settings container key to enable the alternative tooltips.
 	 *
-	 * - Bugfix: Tooltips: optional alternative JS implementation with CSS transitions to fix configuration-related outage, thanks to @andreasra feedback.
+	 * These alternative tooltips work around a website-related jQuery UI
+	 * outage. They are low-script but use the AMP-incompatible `onmouseover`
+	 * and `onmouseout` arguments, along with CSS transitions for fade-in/out.
+	 * The very small script is inserted after the plugin's internal stylesheet.
 	 *
-	 * @reporter @andreasra
-	 * @link https://wordpress.org/support/topic/footnotes-appearing-in-header/page/2/#post-13632566
+	 * @var  string
 	 *
-	 * @since 2.1.1
-	 * @var str
-	 *
-	 * These alternative tooltips work around a website related jQuery UI
-	 * outage. They are low-script but use the AMP incompatible onmouseover
-	 * and onmouseout arguments, along with CSS transitions for fade-in/out.
-	 * The very small script is inserted after Footnotes’ internal stylesheet.
+	 * @since  2.1.1
 	 */
 	const C_STR_FOOTNOTES_MOUSE_OVER_BOX_ALTERNATIVE = 'footnote_inputfield_custom_mouse_over_box_alternative';
 
 	/**
 	 * Settings container key for the referrer element.
 	 *
-	 * - Bugfix: Referrers: new setting for vertical align: superscript (default) or baseline (optional), thanks to @cwbayer bug report.
+	 * @var  string
 	 *
-	 * @reporter @cwbayer
-	 * @link https://wordpress.org/support/topic/footnote-number-in-text-superscript-disrupts-leading/
-	 *
-	 * @since 2.1.1
-	 * @var str
+	 * @since  2.1.1
 	 */
 	const C_STR_FOOTNOTES_REFERRER_SUPERSCRIPT_TAGS = 'footnotes_inputfield_referrer_superscript_tags';
 
 	/**
 	 * Settings container key to enable the display of a backlink symbol.
 	 *
-	 * - Bugfix: Reference container: Backlink symbol: make optional, not suggest configuring it to invisible, thanks to @spaceling feedback.
+	 * @var  string
 	 *
-	 * @reporter @spaceling
-	 * @link https://wordpress.org/support/topic/change-the-position-5/page/2/#post-13671138
-	 *
-	 * @since 2.1.1
-	 * @var str
+	 * @since  2.1.1
 	 */
 	const C_STR_REFERENCE_CONTAINER_BACKLINK_SYMBOL_ENABLE = 'footnotes_inputfield_reference_container_backlink_symbol_enable';
 
 	/**
 	 * Settings container key to not display the reference container on the homepage.
 	 *
-	 * - Bugfix: Reference container: fix start pages by making its display optional, thanks to @dragon013 bug report.
+	 * @var  string
 	 *
-	 * @reporter @dragon013
-	 * @link https://wordpress.org/support/topic/possible-to-hide-it-from-start-page/
-	 *
-	 * @since 2.1.1
-	 * @var str
+	 * @since  2.1.1
 	 */
 	const C_STR_REFERENCE_CONTAINER_START_PAGE_ENABLE = 'footnotes_inputfield_reference_container_start_page_enable';
 
 	/**
 	 * Settings container key to enable the legacy layout of the reference container.
 	 *
-	 * - Bugfix: Reference container: option to restore pre-2.0.0 layout with the backlink symbol in an extra column.
+	 * @var  string
 	 *
-	 * @since 2.1.1
-	 * @var str
+	 * @since  2.1.1
 	 */
 	const C_STR_REFERENCE_CONTAINER_3COLUMN_LAYOUT_ENABLE = 'footnotes_inputfield_reference_container_3column_layout_enable';
 
 	/**
 	 * Settings container key to get the backlink symbol switch side.
 	 *
-	 * - Bugfix: Reference container: option to append symbol (prepended by default), thanks to @spaceling code contribution.
+	 * @var  string
 	 *
-	 * @contributor @spaceling
-	 * @link https://wordpress.org/support/topic/change-the-position-5/#post-13615994
-	 *
-	 * @since 2.1.1
-	 * @var str
+	 * @since  2.1.1
 	 */
 	const C_STR_REFERENCE_CONTAINER_BACKLINK_SYMBOL_SWITCH = 'footnotes_inputfield_reference_container_backlink_symbol_switch';
 
 	/**
-	 * Settings container key for 'the_content' hook priority level.
+	 * Settings container key for `the_content` hook priority level.
 	 *
-	 * - Bugfix: Reference container: fix relative position through priority level, thanks to @june01 @imeson @spaceling bug reports, thanks to @spaceling code contribution.
-	 *
-	 * @contributor @spaceling
-	 * @link https://wordpress.org/support/topic/change-the-position-5/#post-13608594
-	 *
-	 * @reporter @june01
-	 * @link https://wordpress.org/support/topic/change-the-position-5/
-	 *
-	 * @reporter @imeson
-	 * @link https://wordpress.org/support/topic/change-the-position-5/#post-13538345
-	 *
-	 * @since 2.0.5
-	 * @link https://codex.wordpress.org/Plugin_API/#Hook_in_your_Filter
-	 *
-	 * - Bugfix: Dashboard: priority level setting for the_content hook, thanks to @imeson bug report.
-	 *
-	 * @reporter @imeson
-	 * @link https://wordpress.org/support/topic/change-the-position-5/#post-13538345
-	 *
-	 * @since 2.1.1
-	 *
-	 * - Bugfix: Priority levels: set the_content priority level to 98 to prevent plugin conflict, thanks to @marthalindeman bug report.
-	 *
-	 * @reporter @marthalindeman
-	 * @link https://wordpress.org/support/topic/code-showing-up-in-references/
-	 *
-	 * @since 2.1.6
-	 *
-	 * Priority level of the_content and of widget_text as the only relevant
+	 * Priority level of `the_content` and of `widget_text` as the only relevant
 	 * hooks must be less than 99 because social buttons may yield scripts
-	 * that contain the strings '((' and '))', i.e. the default footnote
-	 * start and end short codes, causing issues with fake footnotes.
+	 * that contain the strings ‘((’ and ‘))’ (i.e., the default footnote
+	 * start and end shortcodes), which causes issues with fake footnotes.
 	 *
-	 * Setting the_content priority to 10 instead of PHP_INT_MAX i.e. 9223372036854775807
-	 * makes the footnotes reference container display beneath the post and above other
+	 * Setting `the_content` priority to 10 instead of `PHP_INT_MAX` makes the 
+	 * footnotes reference container display beneath the post and above other
 	 * features added by other plugins, e.g. related post lists and social buttons.
 	 *
-	 * For YARPP to display related posts below the Footnotes reference container,
-	 * priority needs to be at least 1200 (i.e. 0 =< $l_int_the_content_priority =< 1200).
+	 * For the {@link https://wordpress.org/plugins/yet-another-related-posts-plugin/
+	 * YARPP} plugin to display related posts below the Footnotes reference container,
+	 * priority needs to be at least 1,200.
 	 *
-	 * PHP_INT_MAX cannot be reset by leaving the number box empty. because browsers
-	 * (WebKit) don’t allow it, so we must resort to -1.
-	 * @link https://github.com/Modernizr/Modernizr/issues/171
-	 * @var int
+	 * `PHP_INT_MAX` cannot be reset by leaving the number box empty, because 
+	 * WebKit browsers don't allow it, so we must resort to -1.
+	 * 
+	 * @var  int
+	 *
+	 * @since  2.0.5
 	 */
 	const C_INT_EXPERT_LOOKUP_THE_CONTENT_PRIORITY_LEVEL = 'footnote_inputfield_expert_lookup_the_content_priority_level';
 
 	/**
-	 * Settings container key for 'the_title' hook priority level.
+	 * Settings container key for `the_title` hook priority level.
 	 *
-	 * - Bugfix: Dashboard: priority level settings for all other hooks, thanks to @nikelaos bug report.
+	 * @var  int
 	 *
-	 * @reporter @nikelaos
-	 * @link https://wordpress.org/support/topic/doesnt-work-any-more-11/#post-13676705
-	 *
-	 * @since 2.1.2
-	 * @var int
+	 * @since  2.1.2
 	 */
 	const C_INT_EXPERT_LOOKUP_THE_TITLE_PRIORITY_LEVEL = 'footnote_inputfield_expert_lookup_the_title_priority_level';
 
 	/**
-	 * Settings container key for 'widget_title' hook priority level.
+	 * Settings container key for `widget_title` hook priority level.
 	 *
-	 * @since 2.1.2
-	 * @var int
+	 * @var  int
+	 *
+	 * @since  2.1.2
 	 */
 	const C_INT_EXPERT_LOOKUP_WIDGET_TITLE_PRIORITY_LEVEL = 'footnote_inputfield_expert_lookup_widget_title_priority_level';
 
 	/**
-	 * Settings container key for 'widget_text' hook priority level.
+	 * Settings container key for `widget_text` hook priority level.
 	 *
-	 * @since 2.1.2
-	 * @var int
+	 * @var  int
+	 *
+	 * @since  2.1.2
 	 */
 	const C_INT_EXPERT_LOOKUP_WIDGET_TEXT_PRIORITY_LEVEL = 'footnote_inputfield_expert_lookup_widget_text_priority_level';
 
 	/**
-	 * Settings container key for 'the_excerpt' hook priority level.
+	 * Settings container key for `the_excerpt` hook priority level.
 	 *
-	 * @since 2.1.2
-	 * @var int
+	 * @var  int
+	 *
+	 * @since  2.1.2
 	 */
 	const C_INT_EXPERT_LOOKUP_THE_EXCERPT_PRIORITY_LEVEL = 'footnote_inputfield_expert_lookup_the_excerpt_priority_level';
 
 	/**
 	 * Settings container key for the link element option.
 	 *
-	 * - Bugfix: Referrers and backlinks: Styling: make link elements optional to fix issues, thanks to @docteurfitness issue report and code contribution.
+	 * @var  string
 	 *
-	 * @contributor @docteurfitness
-	 * @link https://wordpress.org/support/topic/update-2-1-3/#post-13704194
-	 *
-	 * @since 2.1.4
-	 * @var str
+	 * @since  2.1.4
 	 */
 	const C_STR_LINK_ELEMENT_ENABLED = 'footnote_inputfield_link_element_enabled';
 
 	/**
 	 * Settings container key to enable the presence of a backlink separator.
 	 *
-	 * - Bugfix: Reference container: make separating and terminating punctuation optional and configurable, thanks to @docteurfitness issue report and code contribution.
+	 * Backlink separators and terminators are often not preferred, but a choice 
+	 * should be provided along with the ability to customize.
 	 *
-	 * @contributor @docteurfitness
-	 * @link https://wordpress.org/support/topic/update-2-1-3/#post-13704194
+	 * @var  string
 	 *
-	 * @since 2.1.4
-	 * @var str
-	 *
-	 * Backlink separators and terminators are often not preferred.
-	 * But a choice must be provided along with the ability to customize.
+	 * @since  2.1.4
 	 */
 	const C_STR_BACKLINKS_SEPARATOR_ENABLED = 'footnotes_inputfield_backlinks_separator_enabled';
 
 	/**
 	 * Settings container key for the backlink separator options.
 	 *
-	 * @since 2.1.4
-	 * @var str
+	 * @var  string
+	 *
+	 * @since  2.1.4
 	 */
 	const C_STR_BACKLINKS_SEPARATOR_OPTION = 'footnotes_inputfield_backlinks_separator_option';
 
 	/**
 	 * Settings container key for a custom backlink separator.
 	 *
-	 * @since 2.1.4
-	 * @var str
+	 * @var  string
+	 *
+	 * @since  2.1.4
 	 */
 	const C_STR_BACKLINKS_SEPARATOR_CUSTOM = 'footnotes_inputfield_backlinks_separator_custom';
 
 	/**
 	 * Settings container key to enable the presence of a backlink terminator.
 	 *
-	 * @since 2.1.4
-	 * @var str
+	 * @var  string
+	 *
+	 * @since  2.1.4
 	 */
 	const C_STR_BACKLINKS_TERMINATOR_ENABLED = 'footnotes_inputfield_backlinks_terminator_enabled';
 
 	/**
 	 * Settings container key for the backlink terminator options.
 	 *
-	 * @since 2.1.4
-	 * @var str
+	 * @var  string
+	 *
+	 * @since  2.1.4
 	 */
 	const C_STR_BACKLINKS_TERMINATOR_OPTION = 'footnotes_inputfield_backlinks_terminator_option';
 
 	/**
 	 * Settings container key for a custom backlink terminator.
 	 *
-	 * @since 2.1.4
-	 * @var str
+	 * @var  string
+	 *
+	 * @since  2.1.4
 	 */
 	const C_STR_BACKLINKS_TERMINATOR_CUSTOM = 'footnotes_inputfield_backlinks_terminator_custom';
 
 	/**
 	 * Settings container key to enable the backlinks column width.
 	 *
-	 * @since 2.1.4
-	 * @var str
+	 * @var  string
+	 *
+	 * @since  2.1.4
 	 */
 	const C_STR_BACKLINKS_COLUMN_WIDTH_ENABLED = 'footnotes_inputfield_backlinks_column_width_enabled';
 
 	/**
 	 * Settings container key for the backlinks column width scalar.
 	 *
-	 * @since 2.1.4
-	 * @var int
+	 * @var  int
+	 *
+	 * @since  2.1.4
 	 */
 	const C_INT_BACKLINKS_COLUMN_WIDTH_SCALAR = 'footnotes_inputfield_backlinks_column_width_scalar';
 
 	/**
 	 * Settings container key for the backlinks column width unit.
 	 *
-	 * @since 2.1.4
-	 * @var str
+	 * @var  string
+	 *
+	 * @since  2.1.4
 	 */
 	const C_STR_BACKLINKS_COLUMN_WIDTH_UNIT = 'footnotes_inputfield_backlinks_column_width_unit';
 
 	/**
 	 * Settings container key to enable a max width for the backlinks column.
 	 *
-	 * @since 2.1.4
-	 * @var str
+	 * @var  string
+	 *
+	 * @since  2.1.4
 	 */
 	const C_STR_BACKLINKS_COLUMN_MAX_WIDTH_ENABLED = 'footnotes_inputfield_backlinks_column_max_width_enabled';
 
 	/**
 	 * Settings container key for the backlinks column max width scalar.
 	 *
-	 * @since 2.1.4
-	 * @var int
+	 * @var  int
+	 *
+	 * @since  2.1.4
 	 */
 	const C_INT_BACKLINKS_COLUMN_MAX_WIDTH_SCALAR = 'footnotes_inputfield_backlinks_column_max_width_scalar';
 
 	/**
 	 * Settings container key for the backlinks column max width unit.
 	 *
-	 * @since 2.1.4
-	 * @var str
+	 * @var  string
+	 *
+	 * @since  2.1.4
 	 */
 	const C_STR_BACKLINKS_COLUMN_MAX_WIDTH_UNIT = 'footnotes_inputfield_backlinks_column_max_width_unit';
 
 	/**
 	 * Settings container key to enable line breaks between backlinks.
 	 *
-	 * @since 2.1.4
-	 * @var str
+	 * @var  string
+	 *
+	 * @since  2.1.4
 	 * Whether a <br /> tag is inserted.
 	 */
 	const C_STR_BACKLINKS_LINE_BREAKS_ENABLED = 'footnotes_inputfield_backlinks_line_breaks_enabled';
@@ -730,8 +660,9 @@ class Footnotes_Settings {
 	/**
 	 * Settings container key to enable setting the tooltip font size.
 	 *
-	 * @since 2.1.4
-	 * @var str
+	 * @var  string
+	 *
+	 * @since  2.1.4
 	 *
 	 * Tooltip font size reset to legacy by default since 2.1.4;
 	 * Was set to inherit since 2.1.1 as it overrode custom CSS,
@@ -742,160 +673,167 @@ class Footnotes_Settings {
 	/**
 	 * Settings container key for the scalar value of the tooltip font size.
 	 *
-	 * @since 2.1.4
-	 * @var flo
+	 * @var  float
+	 *
+	 * @since  2.1.4
 	 */
 	const C_FLO_MOUSE_OVER_BOX_FONT_SIZE_SCALAR = 'footnotes_inputfield_mouse_over_box_font_size_scalar';
 
 	/**
 	 * Settings container key for the unit of the tooltip font size.
 	 *
-	 * @since 2.1.4
-	 * @var str
+	 * @var  string
+	 *
+	 * @since  2.1.4
 	 */
 	const C_STR_MOUSE_OVER_BOX_FONT_SIZE_UNIT = 'footnotes_inputfield_mouse_over_box_font_size_unit';
 
 	/**
 	 * Settings container key for basic responsive page layout support options.
-	 *
-	 * @since 2.1.4
-	 * @var str
+	 * 
 	 * Whether to concatenate an additional stylesheet.
+	 *
+	 * @var  string
+	 *
+	 * @since  2.1.4
 	 */
 	const C_STR_FOOTNOTES_PAGE_LAYOUT_SUPPORT = 'footnotes_inputfield_page_layout_support';
 
 	/**
 	 * Settings container key for scroll offset.
 	 *
-	 * - Bugfix: Scroll offset: make configurable to fix site-dependent issues related to fixed headers.
+	 * @var  int
 	 *
-	 * @since 2.1.4
-	 * @var int
+	 * @since  2.1.4
 	 */
 	const C_INT_FOOTNOTES_SCROLL_OFFSET = 'footnotes_inputfield_scroll_offset';
 
 	/**
 	 * Settings container key for scroll duration.
 	 *
-	 * - Bugfix: Scroll duration: make configurable to conform to website content and style requirements.
+	 * @var  int
 	 *
-	 * @since 2.1.4
-	 * @var int
+	 * @since  2.1.4
 	 */
 	const C_INT_FOOTNOTES_SCROLL_DURATION = 'footnotes_inputfield_scroll_duration';
 
 	/**
 	 * Settings container key for tooltip display fade-in delay.
 	 *
-	 * @since 2.1.4
-	 * @var int
+	 * @var  int
+	 *
+	 * @since  2.1.4
 	 */
 	const C_INT_MOUSE_OVER_BOX_FADE_IN_DELAY = 'footnotes_inputfield_mouse_over_box_fade_in_delay';
 
 	/**
 	 * Settings container key for tooltip display fade-in duration.
 	 *
-	 * @since 2.1.4
-	 * @var int
+	 * @var  int
+	 *
+	 * @since  2.1.4
 	 */
 	const C_INT_MOUSE_OVER_BOX_FADE_IN_DURATION = 'footnotes_inputfield_mouse_over_box_fade_in_duration';
 
 	/**
 	 * Settings container key for tooltip display fade-out delay.
 	 *
-	 * @since 2.1.4
-	 * @var int
+	 * @var  int
+	 *
+	 * @since  2.1.4
 	 */
 	const C_INT_MOUSE_OVER_BOX_FADE_OUT_DELAY = 'footnotes_inputfield_mouse_over_box_fade_out_delay';
 
 	/**
 	 * Settings container key for tooltip display fade-out duration.
 	 *
-	 * @since 2.1.4
-	 * @var int
+	 * @var  int
+	 *
+	 * @since  2.1.4
 	 */
 	const C_INT_MOUSE_OVER_BOX_FADE_OUT_DURATION = 'footnotes_inputfield_mouse_over_box_fade_out_duration';
 
 	/**
 	 * Settings container key for URL wrap option.
 	 *
-	 * This is made optional because it causes weird line breaks.
-	 * Unicode-compliant browsers break URLs at slashes.
+	 * This is made optional because it causes weird line breaks. Unicode-compliant 
+	 * browsers break URLs at slashes.
 	 *
-	 * @since 2.1.6
-	 * @var str
+	 * @var  string
+	 *
+	 * @since  2.1.6
 	 */
 	const C_STR_FOOTNOTE_URL_WRAP_ENABLED = 'footnote_inputfield_url_wrap_enabled';
 
 	/**
 	 * Settings container key for reference container position shortcode.
 	 *
-	 * - Adding: Reference container: support for custom position shortcode, thanks to @hamshe issue report.
+	 * @var  string
 	 *
-	 * @reporter @hamshe
-	 * @link https://wordpress.org/support/topic/reference-container-in-elementor/
-	 *
-	 * @since 2.2.0
-	 * @var str
+	 * @since  2.2.0
 	 */
 	const C_STR_REFERENCE_CONTAINER_POSITION_SHORTCODE = 'footnote_inputfield_reference_container_position_shortcode';
 
 	/**
 	 * Settings container key for the Custom CSS migrated to a dedicated tab.
 	 *
-	 * - Update: Dashboard: Custom CSS: unearth text area and migrate to dedicated tab as designed.
+	 * @var  string
 	 *
-	 * @since 2.2.2
-	 * @var str
+	 * @since  2.2.2
 	 */
 	const C_STR_CUSTOM_CSS_NEW = 'footnote_inputfield_custom_css_new';
 
 	/**
 	 * Settings container key to enable display of legacy Custom CSS metaboxes.
 	 *
-	 * @since 2.2.2
-	 * @var str
+	 * This must be `false` if its setting is contained in the container to be hidden
+	 * because when saving, all missing constants are emptied, and {@see 
+	   Footnotes_Convert::to_bool()} converts empty to `false`.
 	 *
-	 * - Bugfix: Dashboard: Custom CSS: swap migration Boolean, meaning 'show legacy' instead of 'migration complete', due to storage data structure constraints.
+	 * @var  string
 	 *
-	 * @since 2.3.0
-	 *
-	 * The Boolean must be false if its setting is contained in the container to be hidden,
-	 * because when saving, all missing constants are emptied, and to_bool() converts empty to false.
+	 * @since  2.2.2
+	 * @since  2.3.0  Swap migration Boolean, meaning ‘show legacy’ instead of 
+	 *								‘migration complete’, due to storage data structure constraints.
 	 */
 	const C_STR_CUSTOM_CSS_LEGACY_ENABLE = 'footnote_inputfield_custom_css_legacy_enable';
 
 	/**
 	 * Settings container key for alternative tooltip position.
 	 *
-	 * @since 2.2.5
-	 * @var str
+	 * Fixed-width is for alternative tooltips, cannot reuse `max-width` nor offsets.
+	 *
+	 * @var  string
+	 *
+	 * @since  2.2.5
 	 *
-	 * Fixed width is for alternative tooltips, cannot reuse max-width nor offsets.
 	 */
 	const C_STR_FOOTNOTES_ALTERNATIVE_MOUSE_OVER_BOX_POSITION = 'footnotes_inputfield_alternative_mouse_over_box_position';
 
 	/**
-	 * Settings container key for alternative tooltip x offset.
+	 * Settings container key for alternative tooltip _x_-offset.
 	 *
-	 * @since 2.2.5
-	 * @var int
+	 * @var  int
+	 *
+	 * @since  2.2.5
 	 */
 	const C_INT_FOOTNOTES_ALTERNATIVE_MOUSE_OVER_BOX_OFFSET_X = 'footnotes_inputfield_alternative_mouse_over_box_offset_x';
 
 	/**
-	 * Settings container key for alternative tooltip y offset.
+	 * Settings container key for alternative tooltip _y_-offset.
 	 *
-	 * @since 2.2.5
-	 * @var int
+	 * @var  int
+	 *
+	 * @since  2.2.5
 	 */
 	const C_INT_FOOTNOTES_ALTERNATIVE_MOUSE_OVER_BOX_OFFSET_Y = 'footnotes_inputfield_alternative_mouse_over_box_offset_y';
 
 	/**
 	 * Settings container key for alternative tooltip width.
 	 *
-	 * @since 2.2.5
-	 * @var int
+	 * @var  int
+	 *
+	 * @since  2.2.5
 	 */
 	const C_INT_FOOTNOTES_ALTERNATIVE_MOUSE_OVER_BOX_WIDTH = 'footnotes_inputfield_alternative_mouse_over_box_width';
 
@@ -903,337 +841,284 @@ class Footnotes_Settings {
 	/**
 	 * Settings container key for the reference container label element.
 	 *
-	 * - Bugfix: Reference container: Label: option to select paragraph or heading element, thanks to @markhillyer issue report.
+	 * @var  string
 	 *
-	 * @reporter @markhillyer
-	 * @link https://wordpress.org/support/topic/how-do-i-eliminate-the-horizontal-line-beneath-the-reference-container-heading/
-	 *
-	 * @since 2.2.5
-	 * @var str
+	 * @since  2.2.5
 	 */
 	const C_STR_REFERENCE_CONTAINER_LABEL_ELEMENT = 'footnotes_inputfield_reference_container_label_element';
 
 	/**
 	 * Settings container key to enable the reference container label bottom border.
 	 *
-	 * - Bugfix: Reference container: Label: make bottom border an option, thanks to @markhillyer issue report.
+	 * @var  string
 	 *
-	 * @reporter @markhillyer
-	 * @link https://wordpress.org/support/topic/how-do-i-eliminate-the-horizontal-line-beneath-the-reference-container-heading/
-	 *
-	 * @since 2.2.5
-	 * @var str
+	 * @since  2.2.5
 	 */
 	const C_STR_REFERENCE_CONTAINER_LABEL_BOTTOM_BORDER = 'footnotes_inputfield_reference_container_label_bottom_border';
 
 	/**
 	 * Settings container key to enable reference container table row borders.
 	 *
-	 * - Bugfix: Reference container: add option for table borders to restore pre-2.0.0 design, thanks to @noobishh issue report.
+	 * @var  string
 	 *
-	 * @reporter @noobishh
-	 * @link https://wordpress.org/support/topic/borders-25/
-	 *
-	 * @since 2.2.10
-	 * @var str
+	 * @since  2.2.10
 	 */
 	const C_STR_REFERENCE_CONTAINER_ROW_BORDERS_ENABLE = 'footnotes_inputfield_reference_container_row_borders_enable';
 
 	/**
 	 * Settings container key for reference container top margin.
 	 *
-	 * - Bugfix: Reference container: convert top padding to margin and make it a setting, thanks to @hamshe bug report.
+	 * @var  int
 	 *
-	 * @reporter @hamshe
-	 * @link https://wordpress.org/support/topic/reference-container-in-elementor/#post-13786635
-	 *
-	 * @since 2.3.0
-	 * @var int
+	 * @since  2.3.0
 	 */
 	const C_INT_REFERENCE_CONTAINER_TOP_MARGIN = 'footnotes_inputfield_reference_container_top_margin';
 
 	/**
 	 * Settings container key for reference container bottom margin.
 	 *
-	 * - Bugfix: Reference container: convert top padding to margin and make it a setting, thanks to @hamshe bug report.
+	 * @var  int
 	 *
-	 * @reporter @hamshe
-	 * @link https://wordpress.org/support/topic/reference-container-in-elementor/#post-13786635
-	 *
-	 * @since 2.3.0
-	 * @var int
+	 * @since  2.3.0
 	 */
 	const C_INT_REFERENCE_CONTAINER_BOTTOM_MARGIN = 'footnotes_inputfield_reference_container_bottom_margin';
 
 	/**
 	 * Settings container key to enable hard links.
 	 *
-	 * - Adding: Referrers and backlinks: optional hard links for AMP compatibility, thanks to @psykonevro issue report, thanks to @martinneumannat issue report and code contribution.
-	 *
-	 * @contributor @martinneumannat
-	 * @link https://wordpress.org/support/topic/making-it-amp-compatible/
-	 *
-	 * @reporter @psykonevro
-	 * @link https://wordpress.org/support/topic/footnotes-is-not-amp-compatible/
-	 *
-	 * @since 2.3.0
-	 * @var str
-	 *
 	 * When the alternative reference container is enabled, hard links are too.
+	 *
+	 * @var  string
+	 *
+	 * @since  2.3.0
 	 */
 	const C_STR_FOOTNOTES_HARD_LINKS_ENABLE = 'footnotes_inputfield_hard_links_enable';
 
 	/**
 	 * Settings container key for the fragment ID slug in referrers.
 	 *
-	 * @since 2.3.0
-	 * @var str
+	 * @var  string
+	 *
+	 * @since  2.3.0
 	 */
 	const C_STR_REFERRER_FRAGMENT_ID_SLUG = 'footnotes_inputfield_referrer_fragment_id_slug';
 
 	/**
 	 * Settings container key for the fragment ID slug in footnotes.
+	 
+	 * @var  string
 	 *
-	 * @since 2.3.0
-	 * @var str
+	 * @since  2.3.0
 	 */
 	const C_STR_FOOTNOTE_FRAGMENT_ID_SLUG = 'footnotes_inputfield_footnote_fragment_id_slug';
 
 	/**
 	 * Settings container key for the ID separator in fragment IDs.
 	 *
-	 * @since 2.3.0
-	 * @var str
+	 * @var  string
+	 *
+	 * @since  2.3.0
 	 */
 	const C_STR_HARD_LINK_IDS_SEPARATOR = 'footnotes_inputfield_hard_link_ids_separator';
 
 	/**
 	 * Settings container key to enable shortcode syntax validation.
 	 *
-	 * @since 2.4.0
-	 * @var str
+	 * @var  string
+	 *
+	 * @since  2.4.0
 	 */
 	const C_STR_FOOTNOTE_SHORTCODE_SYNTAX_VALIDATION_ENABLE = 'footnotes_inputfield_shortcode_syntax_validation_enable';
 
 	/**
 	 * Settings container key to enable backlink tooltips.
 	 *
-	 * - Update: Reference container: Hard backlinks (optional): optional configurable tooltip hinting to use the backbutton instead, thanks to @theroninjedi47 bug report.
+	 * When hard links are enabled, clicks on the backlinks are logged in the 
+	 * browsing history, along with clicks on the referrers.
+	 * This tooltip hints to use the backbutton instead, so the history gets 
+	 * streamlined again.
+	 * See {@link https://wordpress.org/support/topic/making-it-amp-compatible/#post-13837359
+	 * here} for more information.
 	 *
-	 * @reporter @theroninjedi47
-	 * @link https://wordpress.org/support/topic/hyperlinked-footnotes-creating-excessive-back-history/
+	 * @var  string
 	 *
-	 * @since 2.5.4
-	 * @var str
-	 *
-	 * When hard links are enabled, clicks on the backlinks are logged in the browsing history,
-	 * along with clicks on the referrers.
-	 * This tooltip hints to use the backbutton instead, so the history gets streamlined again.
-	 * @link https://wordpress.org/support/topic/making-it-amp-compatible/#post-13837359
+	 * @since  2.5.4
 	 */
 	const C_STR_FOOTNOTES_BACKLINK_TOOLTIP_ENABLE = 'footnotes_inputfield_backlink_tooltip_enable';
 
 	/**
 	 * Settings container key to configure the backlink tooltip.
 	 *
-	 * - Update: Reference container: Hard backlinks (optional): optional configurable tooltip hinting to use the backbutton instead, thanks to @theroninjedi47 bug report.
+	 * @var  string
 	 *
-	 * @reporter @theroninjedi47
-	 * @link https://wordpress.org/support/topic/hyperlinked-footnotes-creating-excessive-back-history/
-	 *
-	 * @since 2.5.4
-	 * @var str
+	 * @since  2.5.4
 	 */
 	const C_STR_FOOTNOTES_BACKLINK_TOOLTIP_TEXT = 'footnotes_inputfield_backlink_tooltip_text';
 
 	/**
 	 * Settings container key to configure the tooltip excerpt delimiter.
 	 *
-	 * - Update: Tooltips: ability to display dedicated content before `[[/tooltip]]`, thanks to @jbj2199 issue report.
+	 * The first implementation used a fixed shortcode provided in the changelog,
+	 * but footnotes should have freely-configurable shortcodes.
 	 *
-	 * The first implementation used a fixed shortcode provided in the changelog.
-	 * But Footnotes’ UI design policy is to make shortcodes freely configurable.
+	 * Tooltips can display another content than the footnote entry in the 
+	 * reference container. The trigger is a shortcode in the footnote text 
+	 * separating the tooltip text from the note. That is consistent with what 
+	 * WordPress does for excerpts.
 	 *
-	 * @reporter @jbj2199
-	 * @link https://wordpress.org/support/topic/change-tooltip-text/
+	 * @var  string
 	 *
-	 * @since 2.5.4
-	 * @var str
-	 *
-	 * Tooltips can display another content than the footnote entry
-	 * in the reference container. The trigger is a shortcode in
-	 * the footnote text separating the tooltip text from the note.
-	 * That is consistent with what WordPress does for excerpts.
+	 * @since  2.5.4
 	 */
 	const C_STR_FOOTNOTES_TOOLTIP_EXCERPT_DELIMITER = 'footnotes_inputfield_tooltip_excerpt_delimiter';
 
 	/**
-	 * Settings container key to enable mirroring the tooltip excerpt in the reference container.
-	 *
-	 * @since 2.5.4
-	 * @var str
+	 * Settings container key to enable mirroring the tooltip excerpt in the 
+	 * reference container.
 	 *
 	 * Tooltips, even jQuery-driven, may be hard to consult on mobiles.
-	 * This option allows to read the tooltip content in the reference container too.
-	 * @link https://wordpress.org/support/topic/change-tooltip-text/#post-13935050
-	 * But this must not be the default behavior.
-	 * @link https://wordpress.org/support/topic/change-tooltip-text/#post-13935488
+	 * This option allows users to read the tooltip content in the reference 
+	 * container too. See {@link https://wordpress.org/support/topic/change-tooltip-text/#post-13935050
+	 * here} for more information, and {@link https://wordpress.org/support/topic/change-tooltip-text/#post-13935488
+	 * here} for why this must not be the default behavior.
+	 *
+	 * @var  string
+	 *
+	 * @since  2.5.4
 	 */
 	const C_STR_FOOTNOTES_TOOLTIP_EXCERPT_MIRROR_ENABLE = 'footnotes_inputfield_tooltip_excerpt_mirror_enable';
 
 	/**
-	 * Settings container key to configure the tooltip excerpt separator in the reference container.
+	 * Settings container key to configure the tooltip excerpt separator in the 
+	 * reference container.
 	 *
-	 * @since 2.5.4
-	 * @var str
+	 * @var  string
+	 *
+	 * @since  2.5.4
 	 */
 	const C_STR_FOOTNOTES_TOOLTIP_EXCERPT_MIRROR_SEPARATOR = 'footnotes_inputfield_tooltip_excerpt_mirror_separator';
 
 	/**
 	 * Settings container key to enable superscript style normalization.
 	 *
-	 * -Bugfix: Referrers: optional fixes to vertical alignment, font size and position (static) for in-theme consistency and cross-theme stability, thanks to @tomturowski bug report.
+	 * @var  string
 	 *
-	 * @reporter @tomturowski
-	 * @link https://wordpress.org/support/topic/in-line-superscript-ref-rides-to-high/
-	 *
-	 * @since 2.5.4
-	 * @var str
+	 * @since  2.5.4
 	 */
 	const C_STR_FOOTNOTE_REFERRERS_NORMAL_SUPERSCRIPT = 'footnotes_inputfield_referrers_normal_superscript';
 
 	/**
 	 * Settings container key to select the script mode for the reference container.
 	 *
-	 * - Bugfix: Reference container: optional alternative expanding and collapsing without jQuery for use with hard links, thanks to @hopper87it @pkverma99 issue reports.
+	 * @var  string
 	 *
-	 * @reporter @hopper87it
-	 * @link https://wordpress.org/support/topic/footnotes-wp-rocket/
-	 *
-	 * @since 2.5.6
-	 * @var str
+	 * @since  2.5.6
 	 */
 	const C_STR_FOOTNOTES_REFERENCE_CONTAINER_SCRIPT_MODE = 'footnotes_inputfield_reference_container_script_mode';
 
 	/**
 	 * Settings container key to enable AMP compatibility mode.
 	 *
-	 * - Adding: Tooltips: make display work purely by style rules for AMP compatibility, thanks to @milindmore22 code contribution.
-	 * - Bugfix: Tooltips: enable accessibility by keyboard navigation, thanks to @westonruter code contribution.
-	 * - Adding: Reference container: get expanding and collapsing to work also in AMP compatibility mode, thanks to @westonruter code contribution.
+	 * @var  string
 	 *
-	 * @contributor @milindmore22
-	 * @link https://github.com/ampproject/amp-wp/issues/5913#issuecomment-785306933
-	 *
-	 * @contributor @westonruter
-	 * @link https://github.com/ampproject/amp-wp/issues/5913#issuecomment-785419655
-	 * @link https://github.com/markcheret/footnotes/issues/48#issuecomment-799580854
-	 * @link https://github.com/markcheret/footnotes/issues/48#issuecomment-799582394
-	 *
-	 * @since 2.5.11 (draft)
-	 * @since 2.6.0  (release)
-	 * @var str
+	 * @since  2.6.0
 	 */
 	const C_STR_FOOTNOTES_AMP_COMPATIBILITY_ENABLE = 'footnotes_inputfield_amp_compatibility_enable';
 
 	/**
 	 * Settings container key for scroll duration asymmetricity.
 	 *
-	 * @since 2.5.11
-	 * @var str
+	 * @var  int
+	 *
+	 * @since  2.5.11
 	 */
 	const C_STR_FOOTNOTES_SCROLL_DURATION_ASYMMETRICITY = 'footnotes_inputfield_scroll_duration_asymmetricity';
 
 	/**
-	 * Settings container key for scroll down duration.
+	 * Settings container key for scroll-down duration.
 	 *
-	 * @since 2.5.11
-	 * @var int
+	 * @var  int
+	 *
+	 * @since  2.5.11
 	 */
 	const C_INT_FOOTNOTES_SCROLL_DOWN_DURATION = 'footnotes_inputfield_scroll_down_duration';
 
 	/**
-	 * Settings container key for scroll down delay.
+	 * Settings container key for scroll-down delay.
 	 *
-	 * @since 2.5.11
-	 * @var int
+	 * @var  int
+	 *
+	 * @since  2.5.11
 	 */
 	const C_INT_FOOTNOTES_SCROLL_DOWN_DELAY = 'footnotes_inputfield_scroll_down_delay';
 
 	/**
-	 * Settings container key for scroll up delay.
+	 * Settings container key for scroll-up delay.
 	 *
-	 * @since 2.5.11
-	 * @var int
+	 * @var  int
+	 *
+	 * @since  2.5.11
 	 */
 	const C_INT_FOOTNOTES_SCROLL_UP_DELAY = 'footnotes_inputfield_scroll_up_delay';
 
 	/**
 	 * Settings container key to set the solution of the input element label issue.
 	 *
-	 * @since 2.5.12
-	 * @var str
 	 * If hard links are not enabled, clicking a referrer in an input element label
 	 * toggles the state of the input element the label is connected to.
 	 * Beside hard links, other solutions include moving footnotes off the label and
 	 * append them, or disconnecting this label from the input element (discouraged).
-	 * @link https://wordpress.org/support/topic/compatibility-issue-with-wpforms/#post-14212318
+	 * See {@link https://wordpress.org/support/topic/compatibility-issue-with-wpforms/#post-14212318
+	 * here} for more information.
+	 *
+	 * @var  string
+	 *
+	 * @since  2.5.12
+	 * @todo  Review, remove?
 	 */
 	const C_STR_FOOTNOTES_LABEL_ISSUE_SOLUTION = 'footnotes_inputfield_label_issue_solution';
 
 	/**
 	 * Settings container key to enable CSS smooth scrolling.
 	 *
-	 * - Update: Scrolling: CSS-based smooth scroll behavior (optional), thanks to @paulgpetty and @bogosavljev issue reports.
-	 *
-	 * @reporter @paulgpetty
-	 * @link https://wordpress.org/support/topic/functionally-great/#post-13607795
-	 *
-	 * @reporter @bogosavljev
-	 * @link https://wordpress.org/support/topic/compatibility-issue-with-wpforms/#post-14214720
-	 *
-	 * @since 2.5.12
-	 * @var str
 	 * Native smooth scrolling only works in recent browsers.
+	 *
+	 * @var  string
+	 *
+	 * @since  2.5.12
 	 */
 	const C_STR_FOOTNOTES_CSS_SMOOTH_SCROLLING = 'footnotes_inputfield_css_smooth_scrolling';
 
 	/**
 	 * Settings container key for the footnote section shortcode.
 	 *
-	 * - Adding: Reference container: optionally per section by shortcode, thanks to @grflukas issue report.
+	 * @var  string
 	 *
-	 * @reporter @grflukas
-	 * @link https://wordpress.org/support/topic/multiple-reference-containers-in-single-post/
-	 *
-	 * @since 2.7.0
-	 * @var str
+	 * @since  2.7.0
 	 */
 	const C_STR_FOOTNOTE_SECTION_SHORTCODE = 'footnotes_inputfield_section_shortcode';
 
-
-	/**
+	/**********************************************************************
 	 *      SETTINGS STORAGE.
-	 */
+	 **********************************************************************/
 
 	/**
 	 * Stores a singleton reference of this class.
 	 *
+	 * @var  Footnotes_Settings
+	 *
 	 * @since  1.5.0
-	 * @var Footnotes_Settings
 	 */
 	private static $a_obj_instance = null;
 
 	/**
 	 * Contains all Settings Container names.
 	 *
-	 * @since 1.5.0
-	 * @var array
-	 *
-	 * Edited.
-	 * 2.2.2  added tab for Custom CSS
-	 *
 	 * These are the storage container names, one per dashboard tab.
+	 *
+	 * @var  string[]
+	 *
+	 * @since  1.5.0
 	 */
 	private $a_arr_container = array(
 		'footnotes_storage',
@@ -1243,12 +1128,14 @@ class Footnotes_Settings {
 	);
 
 	/**
-	 * Contains all Default Settings for each Settings Container.
+	 * Contains all default values for each Settings Container.
 	 *
-	 * @since 1.5.0
-	 * @var array
+	 * @var  (string|int)[]
+	 * @see  C_STR_*
 	 *
-	 * Comments are moved to constant docblocks.
+	 * @since  1.5.0
+	 * @todo  Review. Why are the constants just initialised with these values?
+	 *				At the very least, we should stop using ‘yes’ to mean `true` etc.
 	 */
 	private $a_arr_default = array(
 
@@ -1433,17 +1320,18 @@ class Footnotes_Settings {
 	);
 
 	/**
-	 * Contains all Settings from each Settings container as soon as this class is initialized.
+	 * Contains all Settings from each Settings Container.
 	 *
-	 * @since 1.5.0
-	 * @var array
+	 * @var  (string|int)[]
+	 *
+	 * @since  1.5.0
 	 */
 	private $a_arr_settings = array();
 
 	/**
-	 * Class Constructor. Loads all Settings from each WordPress Settings container.
+	 * Loads all Settings from each WordPress Settings Container.
 	 *
-	 * @since 1.5.0
+	 * @since  1.5.0
 	 */
 	private function __construct() {
 		$this->load_all();
@@ -1452,8 +1340,10 @@ class Footnotes_Settings {
 	/**
 	 * Returns a singleton of this class.
 	 *
-	 * @since 1.5.0
-	 * @return Footnotes_Settings
+	 * @return  Footnotes_Settings
+	 *
+	 * @since  1.5.0
+	 * @todo  Remove?
 	 */
 	public static function instance() {
 		// No instance defined yet, load it.
@@ -1467,20 +1357,22 @@ class Footnotes_Settings {
 	/**
 	 * Returns the name of a specified Settings Container.
 	 *
-	 * @since 1.5.0
-	 * @param int $p_int_index Settings Container Array Key Index.
-	 * @return str Settings Container name.
+	 * @param  int  $p_int_index  Settings Container index.
+	 * @return  str  Settings Container name.
+	 *
+	 * @since  1.5.0
 	 */
 	public function get_container( $p_int_index ) {
 		return $this->a_arr_container[ $p_int_index ];
 	}
 
 	/**
-	 * Returns the default values of a specific Settings Container.
+	 * Returns the default value(s) of a specific Settings Container.
 	 *
-	 * @since 1.5.6
-	 * @param int $p_int_index Settings Container Aray Key Index.
-	 * @return array
+	 * @param  int  $p_int_index  Settings Container index.
+	 * @return  (string|int)[]  Settings Container default value(s).
+	 *
+	 * @since  1.5.6
 	 */
 	public function get_defaults( $p_int_index ) {
 		return $this->a_arr_default[ $this->a_arr_container[ $p_int_index ] ];
@@ -1489,7 +1381,7 @@ class Footnotes_Settings {
 	/**
 	 * Loads all Settings from each Settings container.
 	 *
-	 * @since 1.5.0
+	 * @since  1.5.0
 	 */
 	private function load_all() {
 		// Clear current settings.
@@ -1502,18 +1394,12 @@ class Footnotes_Settings {
 	}
 
 	/**
-	 * Loads all settings from specified settings container.
+	 * Loads all settings from specified Settings Containers.
 	 *
-	 * @since 1.5.0
+	 * @param  int  $p_int_index  Settings container index.
+	 * @return  (string|int)[]  Loaded settings (or defaults if specified container is empty).
 	 *
-	 * - Bugfix: Removed the 'trim' function to allow leading and trailing whitespace in settings text boxes, thanks to @compasscare bug report.
-	 *
-	 * @reporter @compasscare
-	 * @link https://wordpress.org/support/topic/leading-space-in-footnotes-tag/
-	 *
-	 * @since 1.5.2
-	 * @param int $p_int_index  Settings container array key index.
-	 * @return array            Settings loaded from defaults if container is empty (first usage).
+	 * @since  1.5.0
 	 */
 	private function load( $p_int_index ) {
 		// Load all settings from container.
@@ -1538,12 +1424,13 @@ class Footnotes_Settings {
 	}
 
 	/**
-	 * Updates a whole Settings container.
+	 * Updates a whole Setting Container on save.
 	 *
-	 * @since 1.5.0
-	 * @param int   $p_int_index Index of the Settings container.
-	 * @param array $p_arr_new_values new Settings.
-	 * @return bool
+	 * @param  int    $p_int_index  Index of the Setting Container.
+	 * @param  array  $p_arr_new_values  The new Settings value(s).
+	 * @return  bool
+	 *
+	 * @since  1.5.0
 	 */
 	public function save_options( $p_int_index, $p_arr_new_values ) {
 		if ( update_option( $this->get_container( $p_int_index ), $p_arr_new_values ) ) {
@@ -1554,42 +1441,23 @@ class Footnotes_Settings {
 	}
 
 	/**
-	 * Returns the value of specified Settings name.
+	 * Returns the value of specified Setting.
 	 *
-	 * @since 1.5.0
-	 * @param string $p_str_key Settings Array Key name.
-	 * @return mixed Value of the Setting on Success or Null in Settings name is invalid.
+	 * @param  string  $p_str_key  Setting key.
+	 * @return  string|int|null  Setting value, or `null` if setting key is invalid.
+	 *
+	 * @since  1.5.0
 	 */
 	public function get( $p_str_key ) {
 		return array_key_exists( $p_str_key, $this->a_arr_settings ) ? $this->a_arr_settings[ $p_str_key ] : null;
 	}
 
 	/**
-	 * Deletes each Settings Container and loads the default values for each Settings Container.
+	 * Register all Settings Containers for the plugin Settings Page in the Dashboard.
 	 *
-	 * @since 1.5.0
+	 * The Settings Container label will be the same as the Settings Container name.
 	 *
-	 * Edit: This didn’t actually work.
-	 * @since 2.2.0 this function is not called any longer when deleting the plugin,
-	 * to protect user data against loss, since manually updating a plugin is safer
-	 * done by deleting and reinstalling (see the warning about database backup).
-	 */
-	public function clear_all() {
-		// Iterate through each Settings Container.
-		$num_settings = count( $this->a_arr_container );
-		for ( $i = 0; $i < $num_settings; $i++ ) {
-			// Delete the settings container.
-			delete_option( $this->get_container( $i ) );
-		}
-		// Set settings back to the default values.
-		$this->a_arr_settings = $this->a_arr_default;
-	}
-
-	/**
-	 * Register all Settings Container for the Plugin Settings Page in the Dashboard.
-	 * Settings Container Label will be the same as the Settings Container Name.
-	 *
-	 * @since 1.5.0
+	 * @since  1.5.0
 	 */
 	public function register_settings() {
 		// Register all settings.
diff --git a/src/includes/class-footnotes-template.php b/src/includes/class-footnotes-template.php
index 9e20f5a..3aa0b23 100644
--- a/src/includes/class-footnotes-template.php
+++ b/src/includes/class-footnotes-template.php
@@ -8,7 +8,8 @@
  *
  * @since  1.5.0
  * @since  2.2.6  Add support for custom templates in sibling folder.
- * @since  2.8.0  Rename file from `templates.php` to `class-footnotes-templates.php`.
+ * @since  2.8.0  Rename file from `templates.php` to `class-footnotes-templates.php`,
+ *								rename `class/` sub-directory to `includes/`.
  */
 
 /**
diff --git a/src/includes/class-footnotes.php b/src/includes/class-footnotes.php
index 313018b..17daea1 100644
--- a/src/includes/class-footnotes.php
+++ b/src/includes/class-footnotes.php
@@ -9,7 +9,8 @@
  * @subpackage  includes
  *
  * @since  1.5.0
- * @since  2.8.0  Rename file from `init.php` to `class-footnotes.php`.
+ * @since  2.8.0  Rename file from `wysiwyg.php` to `class-footnotes-wysiwyg.php`,
+ *								rename `class/` sub-directory to `includes/`.
  */
 
 /**
diff --git a/src/public/class-footnotes-parser.php b/src/public/class-footnotes-parser.php
index 49764cb..004bf82 100644
--- a/src/public/class-footnotes-parser.php
+++ b/src/public/class-footnotes-parser.php
@@ -2,188 +2,129 @@
 /**
  * Includes the core function of the Plugin - Search and Replace the Footnotes.
  *
- * @since 1.5.0
- * @since 2.0.5 Update: Hooks: Default-enable all hooks to prevent footnotes from seeming broken in some parts.
- * @since 2.2.0 Adding: Reference container: support for custom position shortcode, thanks to @hamshe issue report.
- * @since 2.8.0 Rename class from `Footnotes_Task` to `Footnotes_Parser`.
- *
- * @package footnotes
- * @subpackage public
+ * @package  footnotes\public
+ * @since  1.5.0
+ * @since  2.0.5  Enable all hoooks by default.
+ * @since  2.8.0  Rename file from `task.php` to `class-footnotes-parser.php`,
+ *								move from `class/` sub-directory to `public/`.
  */
 
 /**
  * Searches and replaces the footnotes and generates the reference container.
  *
- * @since 1.5.0
- * @since 2.8.0 Rename class from `Footnotes_Task` to `Footnotes_Parser`.
+ * @package  footnotes\public
+ * @since  1.5.0
+ * @since  2.8.0  Rename class from `Footnotes_Task` to `Footnotes_Parser`.
  */
 class Footnotes_Parser {
 
 	/**
 	 * Contains all footnotes found in the searched content.
 	 *
-	 * @since 1.5.0
-	 * @var array
+	 * @since  1.5.0
+	 * @var  string[]
 	 */
 	public static $a_arr_footnotes = array();
 
 	/**
 	 * Flag if the display of 'LOVE FOOTNOTES' is allowed on the current public page.
 	 *
-	 * @since 1.5.0
-	 * @var bool
+	 * @since  1.5.0
+	 * @var  bool
 	 */
 	public static $a_bool_allow_love_me = true;
 
 	/**
 	 * Prefix for the Footnote html element ID.
 	 *
-	 * @since 1.5.8
-	 * @var string
+	 * @since  1.5.8
+	 * @var  string
 	 */
 	public static $a_str_prefix = '';
 
 	/**
 	 * Autoload a.k.a. infinite scroll, or archive view.
 	 *
-	 * - Bugfix: Infinite scroll: debug autoload by adding post ID, thanks to @docteurfitness issue report and code contribution
-	 *
-	 * @reporter @docteurfitness
-	 * @link https://wordpress.org/support/topic/auto-load-post-compatibility-update/
-	 *
-	 * @contributor @docteurfitness
-	 * @link https://wordpress.org/support/topic/auto-load-post-compatibility-update/#post-13618833
-	 *
-	 * @since 2.0.6
-	 * @var int
-	 *
 	 * As multiple posts are appended to each other, functions and fragment IDs must be disambiguated.
 	 * post ID to make everything unique wrt infinite scroll and archive view.
+	 *
+	 * @since  2.0.6
+	 * @var  int
 	 */
 	public static $a_int_post_id = 0;
 
 	/**
 	 * Multiple reference containers in content and widgets.
 	 *
-	 * - Bugfix: Reference container, widget_text hook: support for multiple containers in a page, thanks to @justbecuz bug report.
-	 *
-	 * @reporter @justbecuz
-	 * @link https://wordpress.org/support/topic/reset-footnotes-to-1/
-	 * @link https://wordpress.org/support/topic/reset-footnotes-to-1/#post-13662830
-	 *
-	 * @since 2.2.9
-	 * @var int   Incremented every time after a reference container is inserted.
-	 *
 	 * This ID disambiguates multiple reference containers in a page
 	 * as they may occur when the widget_text hook is active and the page
 	 * is built with Elementor and has an accordion or similar toggle sections.
+	 *
+	 * @since  2.2.9
+	 * @var  int   Incremented every time after a reference container is inserted.
 	 */
 	public static $a_int_reference_container_id = 1;
 
 	/**
 	 * Hard links for AMP compatibility.
 	 *
-	 * @since 2.0.0  Bugfix: footnote links script independent.
+	 * A property because used both in {@see search()} and {@see reference_container()}.
 	 *
-	 * - Bugfix: Referrers and backlinks: remove hard links to streamline browsing history, thanks to @theroninjedi47 bug report.
-	 *
-	 * @reporter @theroninjedi47
-	 * @link https://wordpress.org/support/topic/hyperlinked-footnotes-creating-excessive-back-history/
-	 *
-	 * @since 2.0.4
-	 *
-	 * - Adding: Referrers and backlinks: optional hard links for AMP compatibility, thanks to @psykonevro issue report, thanks to @martinneumannat issue report and code contribution.
-	 *
-	 * @contributor @martinneumannat
-	 * @link https://wordpress.org/support/topic/making-it-amp-compatible/
-	 *
-	 * @reporter @psykonevro
-	 * @link https://wordpress.org/support/topic/footnotes-is-not-amp-compatible/
-	 *
-	 * @since 2.3.0
-	 * @var bool
-	 * A property because used both in search() and reference_container().
+	 * @since  2.0.0
+	 * @var  bool
 	 */
 	public static $a_bool_hard_links_enabled = false;
 
 	/**
 	 * The referrer slug.
 	 *
-	 * @since 2.3.0
-	 * @var str
+	 * @since  2.3.0
+	 * @var  string
 	 */
 	public static $a_str_referrer_link_slug = 'r';
 
 	/**
 	 * The footnote slug.
 	 *
-	 * @since 2.3.0
-	 * @var str
+	 * @since  2.3.0
+	 *
+	 * @var  string
 	 */
 	public static $a_str_footnote_link_slug = 'f';
 
 	/**
 	 * The slug and identifier separator.
 	 *
-	 * @since 2.3.0
-	 * @var str
+	 * @since  2.3.0
+	 *
+	 * @var  string
 	 */
 	private static $a_str_link_ids_separator = '+';
 
 	/**
 	 * Contains the concatenated fragment ID base.
 	 *
-	 * @since 2.3.0
-	 * @var str
+	 * @since  2.3.0
+	 *
+	 * @var  string
 	 */
 	public static $a_str_post_container_id_compound = '';
 
 	/**
 	 * Scroll offset.
 	 *
-	 * - Bugfix: Scroll offset: make configurable to fix site-dependent issues related to fixed headers.
-	 *
-	 * @since 2.1.4
-	 *
-	 * - Bugfix: Scroll offset: initialize to safer one third window height for more robustness, thanks to @lukashuggenberg bug report.
-	 *
-	 * @reporter @lukashuggenberg
-	 * @link https://wordpress.org/support/topic/2-2-6-breaks-all-footnotes/#post-13857922
-	 *
-	 * @since 2.4.0
-	 * @var int
-	 *
 	 * Websites may use high fixed headers not contracting at scroll.
 	 * Scroll offset may now need to get into inline CSS.
 	 * Hence it needs to be loaded twice, because priority levels may not match.
+	 *
+	 * @since  2.1.4
+	 * @var  int
 	 */
 	public static $a_int_scroll_offset = 34;
 
-	/**
+	/*
 	 * Optional link element for footnote referrers and backlinks
 	 *
-	 * @since 2.0.0  add link elements along with hard links.
-	 *
-	 * - Bugfix: Referrers and backlinks: Styling: make link elements optional to fix issues, thanks to @docteurfitness issue report and code contribution.
-	 *
-	 * @reporter @docteurfitness
-	 * @link https://wordpress.org/support/topic/update-2-1-3/
-	 *
-	 * @contributor @docteurfitness
-	 * @link https://wordpress.org/support/topic/update-2-1-3/#post-13704194
-	 *
-	 * @since 2.1.4
-	 *
-	 * - Adding: Referrers and backlinks: optional hard links for AMP compatibility, thanks to @psykonevro issue report, thanks to @martinneumannat issue report and code contribution.
-	 *
-	 * @contributor @martinneumannat
-	 * @link https://wordpress.org/support/topic/making-it-amp-compatible/
-	 *
-	 * @reporter @psykonevro
-	 * @link https://wordpress.org/support/topic/footnotes-is-not-amp-compatible/
-	 *
-	 * @since 2.3.0
-	 *
 	 * Although widely used for that purpose, hyperlinks are disliked for footnote linking.
 	 * Browsers may need to be prevented from logging these clicks in the browsing history,
 	 * as logging compromises the usability of the 'return to previous' button in browsers.
@@ -198,45 +139,38 @@ class Footnotes_Parser {
 	 *
 	 * Yet styling these elements with the link color is not universally preferred, so that
 	 * the very presence of these link elements may need to be avoided.
-	 *
-	 * @see self::$a_bool_hard_links_enabled
-	 * A property because used both in search() and reference_container().
 	 */
 
 	/**
 	 * The span element name.
 	 *
-	 * @since 2.3.0
-	 * @var str
+	 * @since  2.3.0
+	 * @todo  Remove.
+	 * @var  string
 	 */
 	public static $a_str_link_span = 'span';
 
 	/**
 	 * The opening tag.
 	 *
-	 * @since 2.3.0
-	 * @var str
+	 * @since  2.3.0
+	 * @todo  Remove.
+	 * @var  string
 	 */
 	public static $a_str_link_open_tag = '';
 
 	/**
 	 * The closing tag.
 	 *
-	 * @since 2.3.0
-	 * @var str
+	 * @since  2.3.0
+	 * @todo  Remove.
+	 * @var  string
 	 */
 	public static $a_str_link_close_tag = '';
-
-	/**
+	
+	/*
 	 * Dedicated tooltip text.
 	 *
-	 * - Update: Tooltips: ability to display dedicated content before `[[/tooltip]]`, thanks to @jbj2199 issue report.
-	 *
-	 * @reporter @jbj2199
-	 * @link https://wordpress.org/support/topic/change-tooltip-text/
-	 *
-	 * @since 2.5.2
-	 *
 	 * Tooltips can display another content than the footnote entry
 	 * in the reference container. The trigger is a shortcode in
 	 * the footnote text separating the tooltip text from the note.
@@ -246,86 +180,85 @@ class Footnotes_Parser {
 	/**
 	 * The tooltip delimiter shortcode.
 	 *
-	 * @since 2.5.2
-	 * @var str
+	 * @since  2.5.2
+	 * @var  string
 	 */
 	public static $a_str_tooltip_shortcode = '[[/tooltip]]';
 
 	/**
 	 * The tooltip delimiter shortcode length.
 	 *
-	 * @since 2.5.2
-	 * @var int
+	 * @since  2.5.2
+	 * @var  int
 	 */
 	public static $a_int_tooltip_shortcode_length = 12;
 
 	/**
 	 * Whether to mirror the tooltip text in the reference container.
 	 *
-	 * @since 2.5.2
-	 * @var bool
+	 * @since  2.5.2
+	 * @var  bool
 	 */
 	public static $a_bool_mirror_tooltip_text = false;
 
 	/**
 	 * Footnote delimiter start short code.
 	 *
-	 * @since 1.5.0 (constant, variable)
-	 * @since 2.6.2 (property)
-	 * @var str
+	 * @since  1.5.0
+	 * @since  2.6.2  Move from constant to class property.
+	 * @var  string
 	 */
 	public static $a_str_start_tag = '';
 
 	/**
 	 * Footnote delimiter end short code.
 	 *
-	 * @since 1.5.0 (constant, variable)
-	 * @since 2.6.2 (property)
-	 * @var str
+	 * @since  1.5.0
+	 * @since  2.6.2  Move from constant to class property.
+	 * @var  string
 	 */
 	public static $a_str_end_tag = '';
 
 	/**
-	 * Footnote delimiter start short code in regex format.
+	 * Footnote delimiter start short code in RegEx format.
 	 *
-	 * @since 2.4.0 (variable)
-	 * @since 2.6.2 (property)
-	 * @var str
+	 * @since  2.4.0 
+	 * @since  2.6.2  Move from global constant to class property.
+	 * @var  string
 	 */
 	public static $a_str_start_tag_regex = '';
 
 	/**
-	 * Footnote delimiter end short code in regex format.
+	 * Footnote delimiter end short code in RegEx format.
 	 *
-	 * @since 2.4.0 (variable)
-	 * @since 2.6.2 (property)
-	 * @var str
+	 * @since  2.4.0
+	 * @since  2.6.2  Move from global constant to class property.
+	 * @var  string
 	 */
 	public static $a_str_end_tag_regex = '';
 
 	/**
 	 * Footnote delimiter syntax validation enabled.
 	 *
-	 * - Adding: Footnote delimiters: syntax validation for balanced footnote start and end tag short codes.
-	 *
-	 * @since 2.4.0
-	 *
-	 * @var bool
-	 *
 	 * The algorithm first checks for balanced footnote opening and closing tag short codes.
 	 * The first encountered error triggers the display of a warning below the post title.
 	 *
 	 * Unbalanced short codes have caused significant trouble because they are hard to detect.
-	 * Any compiler or other tool reports syntax errors in the first place. Footnotes’ exception
+	 * Any compiler or other tool reports syntax errors in the first place. Footnotes' exception
 	 * is considered a design flaw, and the feature is released as a bug fix after overdue 2.3.0
 	 * released in urgency to provide AMP compat before 2021.
+	 *
+	 * @since  2.4.0
+	 * @var  bool
 	 */
 	public static $a_bool_syntax_error_flag = true;
 
 	/**
 	 * Initialize the class and set its properties.
 	 *
-	 * @since    2.8.0
+	 * @since  2.8.0
+	 * @todo  Reorganise dependencies.
+	 * @todo  Move call to `register_hooks()` to {@see Footnotes_Public}.
 	 */
 	public function __construct() {
 		// TODO: Reorg dependencies.
@@ -334,27 +267,18 @@ class Footnotes_Parser {
 		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-footnotes-settings.php';
 		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-footnotes-template.php';
 
-		// TODO: Move to `Footnotes_Loader`.
+		// TODO: Move to `Footnotes_Public`.
 		$this->register_hooks();
 	}
 
 	/**
 	 * Register WordPress hooks to replace Footnotes in the content of a public page.
 	 *
-	 * @since 1.5.0
-	 *
-	 * @since 1.5.4  Adding: Hooks: support 'the_post' in response to user request for custom post types.
-	 * @since 2.0.5  Bugfix: Reference container: fix relative position through priority level, thanks to @june01 @imeson @spaceling bug reports, thanks to @spaceling code contribution.
-	 * @since 2.0.5  Update: Hooks: Default-enable all hooks to prevent footnotes from seeming broken in some parts.
-	 * @since 2.0.6  Bugfix: Priority level back to PHP_INT_MAX (ref container positioning not this plugin’s responsibility).
-	 * @since 2.0.7  BUGFIX: Hooks: Default-disable 'the_post', thanks to @spaceling @markcheret @nyamachi @whichgodsaves @spiralofhope2 @mmallett @andreasra @widecast @ymorin007 @tashi1es bug reports.
-	 * @since 2.0.7  Bugfix: Set priority level back to 10 assuming it is unproblematic.
-	 * @since 2.0.8  Bugfix: Priority level back to PHP_INT_MAX (need to get in touch with other plugins).
-	 * @since 2.1.0  UPDATE: Hooks: remove 'the_post', the plugin stops supporting this hook.
-	 * @since 2.1.1  Bugfix: Dashboard: priority level setting for the_content hook, thanks to @imeson bug report.
-	 * @since 2.1.2  Bugfix: Dashboard: priority level settings for all other hooks, thanks to @nikelaos bug report.
-	 * @since 2.5.0  Bugfix: Hooks: support footnotes on category pages, thanks to @vitaefit bug report, thanks to @misfist code contribution.
-	 * @since 2.5.1  Bugfix: Hooks: support footnotes in Popup Maker popups, thanks to @squatcher bug report.
+	 * @since  1.5.0
+	 * @since  1.5.4  Add support for @see 'the_post' hook.
+	 * @since  2.0.5  Enable all hooks by default.
+	 * @since  2.1.0  Remove @see 'the_post' support.
+	 * @todo  Move to {@see Footnotes_Public}.
 	 */
 	public function register_hooks() {
 		// Get values from settings.
@@ -388,19 +312,13 @@ class Footnotes_Parser {
 			/**
 			 * Hook for category pages.
 			 *
-			 * - Bugfix: Hooks: support footnotes on category pages, thanks to @vitaefit bug report, thanks to @misfist code contribution.
-			 *
-			 * @reporter @vitaefit
-			 * @link https://wordpress.org/support/topic/footnote-doesntwork-on-category-page/
-			 *
-			 * @contributor @misfist
-			 * @link https://wordpress.org/support/topic/footnote-doesntwork-on-category-page/#post-13864859
-			 *
-			 * @since 2.5.0
-			 *
-			 * Category pages can have rich HTML content in a term description with article status.
-			 * For this to happen, WordPress’ built-in partial HTML blocker needs to be disabled.
+			 * Category pages can have rich HTML content in a term description with 
+			 * article status.
+			 * For this to happen, WordPress' built-in partial HTML blocker needs to 
+			 * be disabled.
 			 * @link https://docs.woocommerce.com/document/allow-html-in-term-category-tag-descriptions/
+			 *
+			 * @since  2.5.0
 			 */
 			add_filter( 'term_description', array( $this, 'footnotes_in_content' ), $l_int_the_content_priority );
 
@@ -412,94 +330,37 @@ class Footnotes_Parser {
 			 * @reporter @squatcher
 			 * @link https://wordpress.org/support/topic/footnotes-use-in-popup-maker/
 			 *
-			 * @since 2.5.1
+			 * @since  2.5.1
 			 */
 			add_filter( 'pum_popup_content', array( $this, 'footnotes_in_content' ), $l_int_the_content_priority );
 		}
 
-		/**
-		 * Adds a filter to the excerpt hook.
-		 *
-		 * @since 1.5.0  The hook 'get_the_excerpt' is filtered too.
-		 * @since 1.5.5  The hook 'get_the_excerpt' is removed but not documented in changelog or docblock.
-		 * @since 2.6.2  The hook 'get_the_excerpt' is readded when attempting to debug excerpt handling.
-		 * @since 2.6.6  The hook 'get_the_excerpt' is removed again because it seems to cause issues in some themes.
-		 */
 		if ( Footnotes_Convert::to_bool( Footnotes_Settings::instance()->get( Footnotes_Settings::C_STR_EXPERT_LOOKUP_THE_EXCERPT ) ) ) {
+			/**
+			 * Adds a filter to the excerpt hook.
+			 *
+			 * @since  1.5.0  The hook @see 'get_the_excerpt' is filtered too.
+			 * @since  1.5.5  The hook @see 'get_the_excerpt' is removed but not documented in changelog or docblock.
+			 * @since  2.6.2  The hook @see 'get_the_excerpt' is readded when attempting to debug excerpt handling.
+			 * @since  2.6.6  The hook @see 'get_the_excerpt' is removed again because it seems to cause issues in some themes.
+			 */
 			add_filter( 'the_excerpt', array( $this, 'footnotes_in_excerpt' ), $l_int_the_excerpt_priority );
 		}
 
 		if ( Footnotes_Convert::to_bool( Footnotes_Settings::instance()->get( Footnotes_Settings::C_STR_EXPERT_LOOKUP_WIDGET_TITLE ) ) ) {
+			/**
+			 * TODO
+			 */
 			add_filter( 'widget_title', array( $this, 'footnotes_in_widget_title' ), $l_int_widget_title_priority );
 		}
 
 		if ( Footnotes_Convert::to_bool( Footnotes_Settings::instance()->get( Footnotes_Settings::C_STR_EXPERT_LOOKUP_WIDGET_TEXT ) ) ) {
+			/**
+			 * TODO
+			 */
 			add_filter( 'widget_text', array( $this, 'footnotes_in_widget_text' ), $l_int_widget_text_priority );
 		}
 
-		/**
-		 * The the_post hook.
-		 *
-		 * - Adding: Hooks: support 'the_post' in response to user request for custom post types.
-		 *
-		 * @since 1.5.4
-		 * @accountable @aricura
-		 * @link https://wordpress.org/support/topic/doesnt-work-in-custon-post-types/#post-5339110
-		 *
-		 *
-		 * - Update: Hooks: Default-enable all hooks to prevent footnotes from seeming broken in some parts.
-		 *
-		 * @since 2.0.5
-		 * @accountable @pewgeuges
-		 *
-		 *
-		 * - BUGFIX: Hooks: Default-disable 'the_post', thanks to @spaceling @markcheret @nyamachi @whichgodsaves @spiralofhope2 @mmallett @andreasra @widecast @ymorin007 @tashi1es bug reports.
-		 *
-		 * @reporter @spaceling
-		 * @link https://wordpress.org/support/topic/change-the-position-5/#post-13612697
-		 *
-		 * @reporter @markcheret on behalf of W. Beinert
-		 * @link https://wordpress.org/support/topic/footnotes-now-appear-in-summaries-even-though-this-is-marked-no/
-		 *
-		 * @reporter @nyamachi
-		 * @link https://wordpress.org/support/topic/footnotes-appearing-in-header/
-		 *
-		 * @reporter @whichgodsaves
-		 * @link https://wordpress.org/support/topic/footnotes-appearing-in-header/#post-13622694
-		 *
-		 * @reporter @spiralofhope2
-		 * @link https://wordpress.org/support/topic/2-0-5-broken/
-		 *
-		 * @reporter @mmallett
-		 * @link https://wordpress.org/support/topic/2-0-5-broken/#post-13623208
-		 *
-		 * @reporter @andreasra
-		 * @link https://wordpress.org/support/topic/footnotes-appearing-in-header/#post-13624091
-		 *
-		 * @reporter @widecast
-		 * @link https://wordpress.org/support/topic/2-0-5-broken/#post-13626222
-		 *
-		 * @reporter @ymorin007
-		 * @link https://wordpress.org/support/topic/footnotes-appearing-in-header/#post-13627050
-		 *
-		 * @reporter @markcheret on behalf of L. Smith
-		 * @link https://wordpress.org/support/topic/footnotes-appear-in-random-places-on-academic-website/
-		 *
-		 * @reporter @tashi1es
-		 * @link https://wordpress.org/support/topic/footnotes-appear-in-random-places-on-academic-website/#post-13630495
-		 *
-		 * @since 2.0.7
-		 * @link https://wordpress.org/support/topic/change-the-position-5/page/2/#post-13630114
-		 * @link https://wordpress.org/support/topic/footnotes-appearing-in-header/#post-13630303
-		 * @link https://wordpress.org/support/topic/footnotes-appearing-in-header/page/2/#post-13630799
-		 * @link https://wordpress.org/support/topic/no-footnotes-anymore/#post-13813233
-		 *
-		 * - UPDATE: Hooks: remove 'the_post', the plugin stops supporting this hook.
-		 *
-		 * @since 2.1.0
-		 * @accountable @pewgeuges
-		 */
-
 		// Reset stored footnotes when displaying the header.
 		self::$a_arr_footnotes      = array();
 		self::$a_bool_allow_love_me = true;
@@ -508,50 +369,25 @@ class Footnotes_Parser {
 	/**
 	 * Outputs the custom css to the header of the public page.
 	 *
-	 * @since 1.5.0
-	 *
-	 * @since 2.1.1  Bugfix: Reference container: fix start pages by making its display optional, thanks to @dragon013 bug report.
-	 * @since 2.1.1  Bugfix: Tooltips: optional alternative JS implementation with CSS transitions to fix configuration-related outage, thanks to @andreasra feedback.
-	 * @since 2.1.3  raise settings priority to override theme stylesheets
-	 * @since 2.1.4  Bugfix: Tooltips: Styling: fix font size issue by adding font size to settings with legacy as default.
-	 * @since 2.1.4  Bugfix: Reference container: fix layout issues by moving backlink column width to settings.
-	 * @since 2.2.5  Bugfix: Reference container: Label: make bottom border an option, thanks to @markhillyer issue report.
-	 * @since 2.2.5  Bugfix: Reference container: Label: option to select paragraph or heading element, thanks to @markhillyer issue report.
-	 * @since 2.3.0  Bugfix: Reference container: convert top padding to margin and make it a setting, thanks to @hamshe bug report.
-	 * @since 2.5.4  Bugfix: Referrers: optional fixes to vertical alignment, font size and position (static) for in-theme consistency and cross-theme stability, thanks to @tomturowski bug report.
+	 * @since  1.5.0
+	 * @todo  Refactor to enqueue stylesheets properly in {@see Footnotes_Public}.
 	 */
 	public function footnotes_output_head() {
 
 		// Insert start tag without switching out of PHP.
 		echo "\r\n<style type=\"text/css\" media=\"all\">\r\n";
 
-		/**
+		/*
 		 * Enables CSS smooth scrolling.
 		 *
-		 * - Update: Scrolling: CSS-based smooth scroll behavior (optional), thanks to @paulgpetty and @bogosavljev issue reports.
-		 *
-		 * @reporter @paulgpetty
-		 * @link https://wordpress.org/support/topic/functionally-great/#post-13607795
-		 *
-		 * @reporter @bogosavljev
-		 * @link https://wordpress.org/support/topic/compatibility-issue-with-wpforms/#post-14214720
-		 *
-		 * @since 2.5.12
 		 * Native smooth scrolling only works in recent browsers.
 		 */
 		if ( Footnotes_Convert::to_bool( Footnotes_Settings::instance()->get( Footnotes_Settings::C_STR_FOOTNOTES_CSS_SMOOTH_SCROLLING ) ) ) {
 			echo "html {scroll-behavior: smooth;}\r\n";
 		}
 
-		/**
-		 * Normalizes the referrers’ vertical alignment and font size.
-		 *
-		 * - Bugfix: Referrers: optional fixes to vertical alignment, font size and position (static) for in-theme consistency and cross-theme stability, thanks to @tomturowski bug report.
-		 *
-		 * @reporter @tomturowski
-		 * @link https://wordpress.org/support/topic/in-line-superscript-ref-rides-to-high/
-		 *
-		 * @since 2.5.4
+		/*
+		 * Normalizes the referrers' vertical alignment and font size.
 		 *
 		 * Cannot be included in external stylesheet, as it is only optional.
 		 * The scope is variable too: referrers only, or all superscript elements.
@@ -566,31 +402,13 @@ class Footnotes_Parser {
 			echo "vertical-align: super; font-size: smaller; position: static;}\r\n";
 		}
 
-		/**
-		 * Reference container display on home page.
-		 *
-		 * - Bugfix: Reference container: fix start pages by making its display optional, thanks to @dragon013 bug report.
-		 *
-		 * @reporter @dragon013
-		 * @link https://wordpress.org/support/topic/possible-to-hide-it-from-start-page/
-		 *
-		 * @since 2.1.1
-		 */
+		// Reference container display on home page.
 		if ( ! Footnotes_Convert::to_bool( Footnotes_Settings::instance()->get( Footnotes_Settings::C_STR_REFERENCE_CONTAINER_START_PAGE_ENABLE ) ) ) {
 
 			echo ".home .footnotes_reference_container { display: none; }\r\n";
 		}
 
-		/**
-		 * Reference container top and bottom margins.
-		 *
-		 * - Bugfix: Reference container: convert top padding to margin and make it a setting, thanks to @hamshe bug report.
-		 *
-		 * @reporter @hamshe
-		 * @link https://wordpress.org/support/topic/reference-container-in-elementor/#post-13786635
-		 *
-		 * @since 2.3.0
-		 */
+		// Reference container top and bottom margins.
 		$l_int_reference_container_top_margin    = intval( Footnotes_Settings::instance()->get( Footnotes_Settings::C_INT_REFERENCE_CONTAINER_TOP_MARGIN ) );
 		$l_int_reference_container_bottom_margin = intval( Footnotes_Settings::instance()->get( Footnotes_Settings::C_INT_REFERENCE_CONTAINER_BOTTOM_MARGIN ) );
 		echo '.footnotes_reference_container {margin-top: ';
@@ -599,32 +417,16 @@ class Footnotes_Parser {
 		echo empty( $l_int_reference_container_bottom_margin ) ? '0' : $l_int_reference_container_bottom_margin;
 		echo "px !important;}\r\n";
 
-		/**
-		 * Reference container label bottom border.
-		 *
-		 * - Bugfix: Reference container: Label: make bottom border an option, thanks to @markhillyer issue report.
-		 * - Bugfix: Reference container: Label: option to select paragraph or heading element, thanks to @markhillyer issue report.
-		 *
-		 * @reporter @markhillyer
-		 * @link https://wordpress.org/support/topic/how-do-i-eliminate-the-horizontal-line-beneath-the-reference-container-heading/
-		 *
-		 * @since 2.2.5
-			 */
+		// Reference container label bottom border.
 		if ( Footnotes_Convert::to_bool( Footnotes_Settings::instance()->get( Footnotes_Settings::C_STR_REFERENCE_CONTAINER_LABEL_BOTTOM_BORDER ) ) ) {
 			echo '.footnote_container_prepare > ';
 			echo Footnotes_Settings::instance()->get( Footnotes_Settings::C_STR_REFERENCE_CONTAINER_LABEL_ELEMENT );
 			echo " {border-bottom: 1px solid #aaaaaa !important;}\r\n";
 		}
 
-		/**
+		/*
 		 * Reference container table row borders.
 		 *
-		 * - Bugfix: Reference container: add option for table borders to restore pre-2.0.0 design, thanks to @noobishh issue report.
-		 *
-		 * @reporter @noobishh
-		 * @link https://wordpress.org/support/topic/borders-25/
-		 *
-		 * @since 2.2.10
 		 * Moving this internal CSS to external using `wp_add_inline_style()` is
 		 * discouraged, because that screws up support, and it is pointless from
 		 * a performance point of view. Moreover, that would cause cache busting
@@ -685,18 +487,10 @@ class Footnotes_Parser {
 			echo "}\r\n";
 		}
 
-		/**
-		 * Hard links scroll offset.
-		 *
-		 * - Bugfix: Scroll offset: make configurable to fix site-dependent issues related to fixed headers.
-		 *
-		 * @since 2.1.4
-		 *
-		 * @since 2.5.6 hard links are always enabled when the alternative reference container is.
-		 */
+		// Hard links scroll offset.
 		self::$a_bool_hard_links_enabled = Footnotes_Convert::to_bool( Footnotes_Settings::instance()->get( Footnotes_Settings::C_STR_FOOTNOTES_HARD_LINKS_ENABLE ) );
 
-		// Correct hard links enabled status depending on AMP compatible or alternative reference container enabled status.
+		// Correct hard links enabled status depending on AMP-compatible or alternative reference container enabled status.
 		if ( Footnotes_Public::$a_bool_amp_enabled || 'jquery' !== Footnotes_Public::$a_str_script_mode ) {
 			self::$a_bool_hard_links_enabled = true;
 		}
@@ -708,19 +502,11 @@ class Footnotes_Parser {
 			echo "vh;}\r\n";
 		}
 
-		/*
-		 * Tooltips.
-		 */
+		// Tooltips.
 		if ( Footnotes_Public::$a_bool_tooltips_enabled ) {
 			echo '.footnote_tooltip {';
 
-			/**
-			 * Tooltip appearance: Tooltip font size.
-			 *
-			 * - Bugfix: Styling: Tooltips: fix font size issue by adding font size to settings with legacy as default.
-			 *
-			 * @since 2.1.4
-			 */
+			// Tooltip appearance: Tooltip font size.
 			echo ' font-size: ';
 			if ( Footnotes_Convert::to_bool( Footnotes_Settings::instance()->get( Footnotes_Settings::C_STR_MOUSE_OVER_BOX_FONT_SIZE_ENABLED ) ) ) {
 				echo Footnotes_Settings::instance()->get( Footnotes_Settings::C_FLO_MOUSE_OVER_BOX_FONT_SIZE_SCALAR );
@@ -730,49 +516,37 @@ class Footnotes_Parser {
 			}
 			echo ' !important;';
 
-			/*
-			 * Tooltip Text color.
-			 */
+			// Tooltip Text color.
 			$l_str_color = Footnotes_Settings::instance()->get( Footnotes_Settings::C_STR_FOOTNOTES_MOUSE_OVER_BOX_COLOR );
 			if ( ! empty( $l_str_color ) ) {
 				printf( ' color: %s !important;', $l_str_color );
 			}
 
-			/*
-			 * Tooltip Background color.
-			 */
+			// Tooltip Background color.
 			$l_str_background = Footnotes_Settings::instance()->get( Footnotes_Settings::C_STR_FOOTNOTES_MOUSE_OVER_BOX_BACKGROUND );
 			if ( ! empty( $l_str_background ) ) {
 				printf( ' background-color: %s !important;', $l_str_background );
 			}
 
-			/*
-			 * Tooltip Border width.
-			 */
+			// Tooltip Border width.
 			$l_int_border_width = Footnotes_Settings::instance()->get( Footnotes_Settings::C_INT_FOOTNOTES_MOUSE_OVER_BOX_BORDER_WIDTH );
 			if ( ! empty( $l_int_border_width ) && intval( $l_int_border_width ) > 0 ) {
 				printf( ' border-width: %dpx !important; border-style: solid !important;', $l_int_border_width );
 			}
 
-			/*
-			 * Tooltip Border color.
-			 */
+			// Tooltip Border color.
 			$l_str_border_color = Footnotes_Settings::instance()->get( Footnotes_Settings::C_STR_FOOTNOTES_MOUSE_OVER_BOX_BORDER_COLOR );
 			if ( ! empty( $l_str_border_color ) ) {
 				printf( ' border-color: %s !important;', $l_str_border_color );
 			}
 
-			/*
-			 * Tooltip Corner radius.
-			 */
+			// Tooltip Corner radius.
 			$l_int_border_radius = Footnotes_Settings::instance()->get( Footnotes_Settings::C_INT_FOOTNOTES_MOUSE_OVER_BOX_BORDER_RADIUS );
 			if ( ! empty( $l_int_border_radius ) && intval( $l_int_border_radius ) > 0 ) {
 				printf( ' border-radius: %dpx !important;', $l_int_border_radius );
 			}
 
-			/*
-			 * Tooltip Shadow color.
-			 */
+			// Tooltip Shadow color.
 			$l_str_box_shadow_color = Footnotes_Settings::instance()->get( Footnotes_Settings::C_STR_FOOTNOTES_MOUSE_OVER_BOX_SHADOW_COLOR );
 			if ( ! empty( $l_str_box_shadow_color ) ) {
 				printf( ' -webkit-box-shadow: 2px 2px 11px %s;', $l_str_box_shadow_color );
@@ -780,25 +554,13 @@ class Footnotes_Parser {
 				printf( ' box-shadow: 2px 2px 11px %s;', $l_str_box_shadow_color );
 			}
 
-			/**
-			 * Tooltip position, dimensions and timing.
-			 *
-			 * - Bugfix: Tooltips: make display delays and fade durations configurable to conform to website style.
-			 *
-			 * @since 2.1.4
-			 *
-			 * - Update: Tooltips: Alternative tooltips: connect to position/timing settings (for themes not supporting jQuery tooltips).
-			 *
-			 * @since 2.2.5
-			 */
+			// Tooltip position, dimensions and timing.
 			if ( ! Footnotes_Public::$a_bool_alternative_tooltips_enabled && ! Footnotes_Public::$a_bool_amp_enabled ) {
 
-				/**
+				/*
 				 * Dimensions of jQuery tooltips.
 				 *
-				 * Position and timing of jQuery tooltips are script defined.
-				 *
-				 * @see public/partials/tooltip.html.
+				 * Position and timing of jQuery tooltips are script-defined.
 				 */
 				$l_int_max_width = Footnotes_Settings::instance()->get( Footnotes_Settings::C_INT_FOOTNOTES_MOUSE_OVER_BOX_MAX_WIDTH );
 				if ( ! empty( $l_int_max_width ) && intval( $l_int_max_width ) > 0 ) {
@@ -807,16 +569,10 @@ class Footnotes_Parser {
 				echo "}\r\n";
 
 			} else {
-				/*
-				 * AMP compatible and alternative tooltips.
-				 */
+				// AMP-compatible and alternative tooltips.
 				echo "}\r\n";
 
-				/**
-				 * Dimensions.
-				 *
-				 * @see 'Determine shrink width if alternative tooltips are enabled'.
-				 */
+				// Dimensions.
 				$l_int_alternative_tooltip_width = intval( Footnotes_Settings::instance()->get( Footnotes_Settings::C_INT_FOOTNOTES_ALTERNATIVE_MOUSE_OVER_BOX_WIDTH ) );
 				echo '.footnote_tooltip.position {';
 				echo ' width: max-content; ';
@@ -824,12 +580,7 @@ class Footnotes_Parser {
 				// Set also as max-width wrt short tooltip shrinking.
 				echo ' max-width: ' . $l_int_alternative_tooltip_width . 'px;';
 
-				/**
-				 * Position.
-				 *
-				 * @see dev-amp-tooltips.css.
-				 * @see dev-tooltips-alternative.css.
-				 */
+				// Position.
 				$l_str_alternative_position = Footnotes_Settings::instance()->get( Footnotes_Settings::C_STR_FOOTNOTES_ALTERNATIVE_MOUSE_OVER_BOX_POSITION );
 				$l_int_offset_x             = intval( Footnotes_Settings::instance()->get( Footnotes_Settings::C_INT_FOOTNOTES_ALTERNATIVE_MOUSE_OVER_BOX_OFFSET_X ) );
 
@@ -848,9 +599,7 @@ class Footnotes_Parser {
 				}
 				echo "}\r\n";
 
-				/*
-				 * Timing.
-				 */
+				// Timing.
 				$l_int_fade_in_delay     = intval( Footnotes_Settings::instance()->get( Footnotes_Settings::C_INT_MOUSE_OVER_BOX_FADE_IN_DELAY ) );
 				$l_int_fade_in_delay     = ! empty( $l_int_fade_in_delay ) ? $l_int_fade_in_delay : '0';
 				$l_int_fade_in_duration  = intval( Footnotes_Settings::instance()->get( Footnotes_Settings::C_INT_MOUSE_OVER_BOX_FADE_IN_DURATION ) );
@@ -860,12 +609,10 @@ class Footnotes_Parser {
 				$l_int_fade_out_duration = intval( Footnotes_Settings::instance()->get( Footnotes_Settings::C_INT_MOUSE_OVER_BOX_FADE_OUT_DURATION ) );
 				$l_int_fade_out_duration = ! empty( $l_int_fade_out_duration ) ? $l_int_fade_out_duration : '0';
 
-				/**
-				 * AMP compatible tooltips.
+				/*
+				 * AMP-compatible tooltips.
 				 *
 				 * To streamline internal CSS, immutable rules are in external stylesheet.
-				 *
-				 * @see dev-amp-tooltips.css.
 				 */
 				if ( Footnotes_Public::$a_bool_amp_enabled ) {
 
@@ -879,12 +626,10 @@ class Footnotes_Parser {
 					echo 'transition-duration: ' . $l_int_fade_in_duration . 'ms;';
 					echo "}\r\n";
 
-					/**
+					/*
 					 * Alternative tooltips.
 					 *
 					 * To streamline internal CSS, immutable rules are in external stylesheet.
-					 *
-					 * @see dev-tooltips-alternative.css.
 					 */
 				} else {
 
@@ -901,13 +646,9 @@ class Footnotes_Parser {
 			}
 		}
 
-		/**
+		/*
 		 * Custom CSS.
 		 *
-		 * - Bugfix: Custom CSS: insert new CSS in the public page header element after existing CSS.
-		 *
-		 * @since 2.2.3
-		 *
 		 * Set custom CSS to override settings, not conversely.
 		 * Legacy Custom CSS is used until it’s set to disappear after dashboard tab migration.
 		 */
@@ -920,15 +661,9 @@ class Footnotes_Parser {
 		// Insert end tag without switching out of PHP.
 		echo "\r\n</style>\r\n";
 
-		/**
+		/*
 		 * Alternative tooltip implementation relying on plain JS and CSS transitions.
 		 *
-		 * - Bugfix: Tooltips: optional alternative JS implementation with CSS transitions to fix configuration-related outage, thanks to @andreasra feedback.
-		 *
-		 * @reporter @andreasra
-		 * @link https://wordpress.org/support/topic/footnotes-appearing-in-header/page/2/#post-13632566
-		 *
-		 * @since 2.1.1
 		 * The script for alternative tooltips is printed formatted, not minified,
 		 * for transparency. It isn’t indented though (the PHP open tag neither).
 		 */
@@ -955,8 +690,7 @@ class Footnotes_Parser {
 	/**
 	 * Displays the 'LOVE FOOTNOTES' slug if enabled.
 	 *
-	 * @since 1.5.0
-	 * @since 2.2.0  More options.
+	 * @since  1.5.0
 	 */
 	public function footnotes_output_footer() {
 		if ( 'footer' === Footnotes_Settings::instance()->get( Footnotes_Settings::C_STR_REFERENCE_CONTAINER_POSITION ) ) {
@@ -1012,9 +746,10 @@ class Footnotes_Parser {
 	/**
 	 * Replaces footnotes in the post/page title.
 	 *
-	 * @since 1.5.0
-	 * @param string $p_str_content  Title.
-	 * @return string $p_str_content  Title with replaced footnotes.
+	 * @since  1.5.0
+	 *
+	 * @param  string  $p_str_content  Title.
+	 * @return  string  $p_str_content  Title with replaced footnotes.
 	 */
 	public function footnotes_in_title( $p_str_content ) {
 		// Appends the reference container if set to "post_end".
@@ -1024,16 +759,10 @@ class Footnotes_Parser {
 	/**
 	 * Replaces footnotes in the content of the current page/post.
 	 *
-	 * @since 1.5.0
+	 * @since  1.5.0
 	 *
-	 * - Adding: Reference container: optionally per section by shortcode, thanks to @grflukas issue report.
-	 *
-	 * @reporter @grflukas
-	 * @link https://wordpress.org/support/topic/multiple-reference-containers-in-single-post/
-	 *
-	 * @since 2.7.0
-	 * @param string $p_str_content  Page/Post content.
-	 * @return string $p_str_content  Content with replaced footnotes.
+	 * @param  string  $p_str_content  Page/Post content.
+	 * @return  string  $p_str_content  Content with replaced footnotes.
 	 */
 	public function footnotes_in_content( $p_str_content ) {
 
@@ -1074,21 +803,14 @@ class Footnotes_Parser {
 	/**
 	 * Processes existing excerpt or replaces it with a new one generated on the basis of the post.
 	 *
-	 * @since 1.5.0
-	 * @param string $p_str_excerpt  Excerpt content.
-	 * @return string $p_str_excerpt  Processed or new excerpt.
-	 * @since 2.6.2  Debug No option.
-	 * @since 2.6.3  Debug Yes option, the setting becomes fully effective.
-	 *
-	 * - Bugfix: Excerpts: make excerpt handling backward compatible, thanks to @mfessler bug report.
-	 *
-	 * @reporter @mfessler
-	 * @link https://github.com/markcheret/footnotes/issues/65
-	 *
-	 * @since 2.7.0
 	 * The input was already the processed excerpt, no more footnotes to search.
 	 * But issue #65 brought up that manual excerpts can include processable footnotes.
-	 * Default 'manual' is fallback and is backward compatible with the initial setup.
+	 * Default 'manual' is fallback and is backwards-compatible with the initial setup.
+	 *
+	 * @since  1.5.0
+	 *
+	 * @param  string  $p_str_excerpt  Excerpt content.
+	 * @return  string  $p_str_excerpt  Processed or new excerpt.
 	 */
 	public function footnotes_in_excerpt( $p_str_excerpt ) {
 		$l_str_excerpt_mode = Footnotes_Settings::instance()->get( Footnotes_Settings::C_STR_FOOTNOTES_IN_EXCERPT );
@@ -1107,24 +829,14 @@ class Footnotes_Parser {
 	/**
 	 * Generates excerpt on the basis of the post.
 	 *
-	 * - Bugfix: Excerpts: debug the 'No' option by generating excerpts on the basis of the post without footnotes, thanks to @nikelaos @markcheret @martinneumannat bug reports.
-	 *
-	 * @reporter @nikelaos
-	 * @link https://wordpress.org/support/topic/jquery-comes-up-in-feed-content/
-	 * @link https://wordpress.org/support/topic/doesnt-work-with-mailpoet/
-	 *
-	 * @reporter @markcheret
-	 * @link https://wordpress.org/support/topic/footnotes-now-appear-in-summaries-even-though-this-is-marked-no/
-	 *
-	 * @reporter @martinneumannat
-	 * @link https://wordpress.org/support/topic/problem-with-footnotes-in-excerpts-of-the-blog-page/
-	 *
-	 * @since 2.6.2
-	 * @param string $p_str_content  The post.
-	 * @return string $p_str_content  An excerpt of the post.
 	 * Applies full WordPress excerpt processing.
 	 * @link https://developer.wordpress.org/reference/functions/wp_trim_excerpt/
 	 * @link https://developer.wordpress.org/reference/functions/wp_trim_words/
+	 *
+	 * @since  2.6.2
+	 *
+	 * @param  string  $p_str_content  The post.
+	 * @return  string  $p_str_content  An excerpt of the post.
 	 */
 	public function generate_excerpt( $p_str_content ) {
 
@@ -1160,35 +872,15 @@ class Footnotes_Parser {
 	/**
 	 * Generates excerpt with footnotes on the basis of the post.
 	 *
-	 * - Bugfix: Excerpts: debug the 'Yes' option by generating excerpts with footnotes on the basis of the posts, thanks to @nikelaos @martinneumannat bug reports.
-	 *
-	 * @reporter @nikelaos
-	 * @link https://wordpress.org/support/topic/jquery-comes-up-in-feed-content/
-	 * @link https://wordpress.org/support/topic/doesnt-work-with-mailpoet/
-	 *
-	 * @reporter @martinneumannat
-	 * @link https://wordpress.org/support/topic/problem-with-footnotes-in-excerpts-of-the-blog-page/
-	 *
-	 * @since 2.6.3
-	 *
-	 * - Bugfix: Process: remove trailing comma after last argument in multiline function calls for PHP < 7.3, thanks to @scroom @copylefter @lagoon24 bug reports.
-	 *
-	 * @reporter @scroom
-	 * @link https://wordpress.org/support/topic/update-crashed-my-website-3/
-	 *
-	 * @reporter @copylefter
-	 * @link https://wordpress.org/support/topic/update-crashed-my-website-3/#post-14259151
-	 *
-	 * @reporter @lagoon24
-	 * @link https://wordpress.org/support/topic/update-crashed-my-website-3/#post-14259396
-	 *
-	 * @since 2.6.4
-	 * @param string $p_str_content  The post.
-	 * @return string $p_str_content  An excerpt of the post.
 	 * Does not apply full WordPress excerpt processing.
 	 * @see self::generate_excerpt()
 	 * Uses information and some code from Advanced Excerpt.
 	 * @link https://wordpress.org/plugins/advanced-excerpt/
+	 *
+	 * @since  2.6.3
+	 *
+	 * @param  string  $p_str_content  The post.
+	 * @return  string  $p_str_content  An excerpt of the post.
 	 */
 	public function generate_excerpt_with_footnotes( $p_str_content ) {
 
@@ -1286,9 +978,10 @@ class Footnotes_Parser {
 	/**
 	 * Replaces footnotes in the widget title.
 	 *
-	 * @since 1.5.0
-	 * @param string $p_str_content  Widget content.
-	 * @return string $p_str_content  Content with replaced footnotes.
+	 * @since  1.5.0
+	 *
+	 * @param  string  $p_str_content  Widget content.
+	 * @return  string  $p_str_content  Content with replaced footnotes.
 	 */
 	public function footnotes_in_widget_title( $p_str_content ) {
 		// Appends the reference container if set to "post_end".
@@ -1298,9 +991,10 @@ class Footnotes_Parser {
 	/**
 	 * Replaces footnotes in the content of the current widget.
 	 *
-	 * @since 1.5.0
-	 * @param string $p_str_content  Widget content.
-	 * @return string $p_str_content  Content with replaced footnotes.
+	 * @since  1.5.0
+	 *
+	 * @param  string  $p_str_content  Widget content.
+	 * @return  string  $p_str_content  Content with replaced footnotes.
 	 */
 	public function footnotes_in_widget_text( $p_str_content ) {
 		// phpcs:disable WordPress.PHP.YodaConditions.NotYoda
@@ -1312,34 +1006,22 @@ class Footnotes_Parser {
 	/**
 	 * Replaces all footnotes that occur in the given content.
 	 *
-	 * @since 1.5.0
-	 * @param string $p_str_content              Any string that may contain footnotes to be replaced.
-	 * @param bool   $p_bool_output_references   Appends the Reference Container to the output if set to true, default true.
-	 * @param bool   $p_bool_hide_footnotes_text Hide footnotes found in the string.
-	 * @return string
+	 * @since  1.5.0
+	 *
+	 * @param  string  $p_str_content  Any string that may contain footnotes to be replaced.
+	 * @param  bool  $p_bool_output_references  Appends the Reference Container to the output if set to true, default true.
+	 * @param  bool  $p_bool_hide_footnotes_text  Hide footnotes found in the string.
+	 * @return  string
 	 */
 	public function exec( $p_str_content, $p_bool_output_references = false, $p_bool_hide_footnotes_text = false ) {
 
 		// Process content.
 		$p_str_content = $this->search( $p_str_content, $p_bool_hide_footnotes_text );
 
-		/**
+		/*
 		 * Reference container customized positioning through shortcode.
-		 *
-		 * - Adding: Reference container: support for custom position shortcode, thanks to @hamshe issue report.
-		 *
-		 * @reporter @hamshe
-		 * @link https://wordpress.org/support/topic/reference-container-in-elementor/
-		 *
-		 * @since 2.2.0
-		 *
-		 * - Bugfix: Reference container: delete position shortcode if unused because position may be widget or footer, thanks to @hamshe bug report.
-		 *
-		 * @reporter @hamshe
-		 * @link https://wordpress.org/support/topic/reference-container-in-elementor/#post-13784126
-		 *
-		 * @since 2.2.5
 		 */
+		 
 		// Append the reference container or insert at shortcode.
 		$l_str_reference_container_position_shortcode = Footnotes_Settings::instance()->get( Footnotes_Settings::C_STR_REFERENCE_CONTAINER_POSITION_SHORTCODE );
 		if ( empty( $l_str_reference_container_position_shortcode ) ) {
@@ -1377,24 +1059,14 @@ class Footnotes_Parser {
 	/**
 	 * Brings the delimiters and unifies their various HTML escapement schemas.
 	 *
-	 * @param string $p_str_content TODO.
-	 *
-	 * - Bugfix: Footnote delimiter short codes: fix numbering bug by cross-editor HTML escapement schema unification, thanks to @patrick_here @alifarahani8000 @gova bug reports.
-	 *
-	 * @reporter @patrick_here
-	 * @link https://wordpress.org/support/topic/how-to-add-footnotes-shortcode-in-elementor/
-	 *
-	 * @reporter @alifarahani8000
-	 * @link https://wordpress.org/support/topic/after-version-2-5-10-the-ref-or-tags-are-not-longer-working/
-	 *
-	 * @reporter @gova
-	 * @link https://wordpress.org/support/topic/footnotes-content-number-not-sequential/
-	 *
-	 * @since 2.1.14
 	 * While the Classic Editor (visual mode) escapes both pointy brackets,
 	 * the Block Editor enforces balanced escapement only in code editor mode
 	 * when the opening tag is already escaped. In visual mode, the Block Editor
 	 * does not escape the greater-than sign.
+	 *
+	 * @since  2.1.14
+	 *
+	 * @param  string  $p_str_content  The footnote, including delimiters.
 	 */
 	public function unify_delimiters( $p_str_content ) {
 
@@ -1456,50 +1128,25 @@ class Footnotes_Parser {
 	/**
 	 * Replaces all footnotes in the given content and appends them to the static property.
 	 *
-	 * @since 1.5.0
-	 * @param string $p_str_content              Any content to be searched for footnotes.
-	 * @param bool   $p_bool_hide_footnotes_text Hide footnotes found in the string.
-	 * @return string
+	 * @since  1.5.0
+	 * @todo  Refactor to parse DOM rather than using RegEx.
 	 *
-	 * @since 2.0.0  various.
-	 * @since 2.4.0  Adding: Footnote delimiters: syntax validation for balanced footnote start and end tag short codes.
-	 * @since 2.5.0  Bugfix: Footnote delimiters: Syntax validation: exclude certain cases involving scripts, thanks to @andreasra bug report.
-	 * @since 2.5.0  Bugfix: Footnote delimiters: Syntax validation: complete message with hint about setting, thanks to @andreasra bug report.
-	 * @since 2.5.0  Bugfix: Footnote delimiters: Syntax validation: limit length of quoted string to 300 characters, thanks to @andreasra bug report.
-	 *
-	 * - Bugfix: Footnote delimiter short codes: debug closing pointy brackets in the Block Editor by accounting for unbalanced HTML escapement, thanks to @patrick_here @alifarahani8000 bug reports.
-	 *
-	 * @reporter @patrick_here
-	 * @link https://wordpress.org/support/topic/how-to-add-footnotes-shortcode-in-elementor/
-	 *
-	 * @reporter @alifarahani8000
-	 * @link https://wordpress.org/support/topic/after-version-2-5-10-the-ref-or-tags-are-not-longer-working/
-	 *
-	 * @since 2.5.13
+	 * @param  string $p_str_content  Any content to be parsed for footnotes.
+	 * @param  bool  $p_bool_hide_footnotes_text  Hide footnotes found in the string.
+	 * @return  string
 	 */
 	public function search( $p_str_content, $p_bool_hide_footnotes_text ) {
 
 		// Get footnote delimiter shortcodes and unify them.
 		$p_str_content = self::unify_delimiters( $p_str_content );
 
-		/**
+		/*
 		 * Checks for balanced footnote delimiters; delimiter syntax validation.
 		 *
-		 * - Adding: Footnote delimiters: syntax validation for balanced footnote start and end tag short codes.
-		 *
-		 * @since 2.4.0
-		 *
-		 * - Bugfix: Footnote delimiters: Syntax validation: exclude certain cases involving scripts, thanks to @andreasra bug report.
-		 * - Bugfix: Footnote delimiters: Syntax validation: complete message with hint about setting, thanks to @andreasra bug report.
-		 * - Bugfix: Footnote delimiters: Syntax validation: limit length of quoted string to 300 characters, thanks to @andreasra bug report.
-		 *
-		 * @reporter @andreasra
-		 * @link https://wordpress.org/support/topic/warning-unbalanced-footnote-start-tag-short-code-before/
-		 *
-		 * @since 2.5.0
 		 * If footnotes short codes are unbalanced, and syntax validation is not disabled,
 		 * prepend a warning to the content; displays de facto beneath the post title.
 		 */
+		 
 		// If enabled.
 		if ( Footnotes_Convert::to_bool( Footnotes_Settings::instance()->get( Footnotes_Settings::C_STR_FOOTNOTE_SHORTCODE_SYNTAX_VALIDATION_ENABLE ) ) ) {
 
@@ -1557,18 +1204,11 @@ class Footnotes_Parser {
 			}
 		}
 
-		/**
+		/*
 		 * Patch to allow footnotes in input field labels.
 		 *
-		 * - Bugfix: Forms: remove footnotes from input field values, thanks to @bogosavljev bug report.
-		 *
-		 * @reporter @bogosavljev
-		 * @link https://wordpress.org/support/topic/compatibility-issue-with-wpforms/
-		 *
-		 * @since 2.5.11
-		 * When the HTML 'input' element 'value' attribute value
-		 * is derived from 'label', footnotes need to be removed
-		 * in the value of 'value'.
+		 * When the HTML 'input' element 'value' attribute value is derived from 
+		 * 'label', footnotes need to be removed in the value of 'value'.
 		 */
 		$l_str_value_regex = '#(<input [^>]+?value=["\'][^>]+?)' . self::$a_str_start_tag_regex . '[^>]+?' . self::$a_str_end_tag_regex . '#';
 
@@ -1576,14 +1216,7 @@ class Footnotes_Parser {
 			$p_str_content = preg_replace( $l_str_value_regex, '$1', $p_str_content );
 		} while ( preg_match( $l_str_value_regex, $p_str_content ) );
 
-		/**
-		 * Optionally moves footnotes outside at the end of the label element.
-		 *
-		 * - Bugfix: Forms: prevent inadvertently toggling input elements with footnotes in their label, by optionally moving footnotes after the end of the label.
-		 *
-		 * @since 2.5.12
-		 * @link https://wordpress.org/support/topic/compatibility-issue-with-wpforms/#post-14212318
-		 */
+		// Optionally moves footnotes outside at the end of the label element.
 		$l_str_label_issue_solution = Footnotes_Settings::instance()->get( Footnotes_Settings::C_STR_FOOTNOTES_LABEL_ISSUE_SOLUTION );
 
 		if ( 'move' === $l_str_label_issue_solution ) {
@@ -1595,14 +1228,11 @@ class Footnotes_Parser {
 			} while ( preg_match( $l_str_move_regex, $p_str_content ) );
 		}
 
-		/**
+		/*
 		 * Optionally disconnects labels with footnotes from their input element.
 		 *
-		 * - Bugfix: Forms: prevent inadvertently toggling input elements with footnotes in their label, by optionally disconnecting those labels.
-		 *
-		 * @since 2.5.12
 		 * This option is discouraged because of accessibility issues.
-		 * This only edits those labels’ 'for' value that have footnotes,
+		 * This only edits those labels' 'for' value that have footnotes,
 		 * but leaves all other labels (those without footnotes) alone.
 		 * @link https://wordpress.org/support/topic/compatibility-issue-with-wpforms/#post-14212318
 		 */
@@ -1620,26 +1250,19 @@ class Footnotes_Parser {
 		// Post ID to make everything unique wrt infinite scroll and archive view.
 		self::$a_int_post_id = get_the_id();
 
-		/**
+		/*
 		 * Empties the footnotes list every time Footnotes is run when the_content hook is called.
 		 *
-		 * - Bugfix: Process: fix footnote duplication by emptying the footnotes list every time the search algorithm is run on the content, thanks to @inoruhana bug report.
-		 *
-		 * @reporter @inoruhana
-		 * @link https://wordpress.org/support/topic/footnote-duplicated-in-the-widget/
-		 *
-		 * @since 2.5.7
 		 * Under certain circumstances, footnotes were duplicated, because the footnotes list was
 		 * not emptied every time before the search algorithm was run. That happened eg when both
 		 * the reference container resides in the widget area, and the YOAST SEO plugin is active
 		 * and calls the hook the_content to generate the Open Graph description, while Footnotes
 		 * is set to avoid missing out on the footnotes (in the content) by hooking in as soon as
 		 * the_content is called, whereas at post end Footnotes seems to hook in the_content only
-		 * the time it’s the blog engine processing the post for display and appending the refs.
+		 * the time it's the blog engine processing the post for display and appending the refs.
 		 *
-		 * @since 2.6.3  Move footnotes list reset from footnotes_in_content() to search().
 		 * Emptying the footnotes list only when the_content hook is called is ineffective
-		 * when footnotes are processed in generate_excerpt_with_footnotes().
+		 * when footnotes are processed in `generate_excerpt_with_footnotes()`.
 		 * Footnotes duplication is prevented also when resetting the list here.
 		 */
 		self::$a_arr_footnotes = array();
@@ -1726,12 +1349,9 @@ class Footnotes_Parser {
 				$l_str_tooltip_text = '';
 			}
 
-			/**
+			/*
 			 * URL line wrapping for Unicode non conformant browsers.
 			 *
-			 * @since 2.1.1 (CSS)
-			 * @since 2.1.4 (PHP)
-			 *
 			 * Despite Unicode recommends to line-wrap URLs at slashes, and Firefox follows
 			 * the Unicode standard, Chrome does not, making long URLs hang out of tooltips
 			 * or extend reference containers, so that the end is hidden outside the window
@@ -1740,110 +1360,12 @@ class Footnotes_Parser {
 			 * that is assigned appropriate CSS properties and values.
 			 * @see css/public.css
 			 *
-			 * - Bugfix: Tooltips: fix line breaking for hyperlinked URLs in Unicode-non-compliant user agents, thanks to @andreasra bug report.
-			 *
-			 * @reporter @andreasra
-			 * @link https://wordpress.org/support/topic/footnotes-appearing-in-header/page/3/#post-13657398
-			 *
-			 * @since 2.1.1
-			 *
-			 * - Bugfix: Reference container: fix width in mobile view by URL wrapping for Unicode-non-conformant browsers, thanks to @karolszakiel bug report.
-			 *
-			 * @reporter @karolszakiel
-			 * @link https://wordpress.org/support/topic/footnotes-on-mobile-phones/
-			 *
-			 * @since 2.1.3
-					 *
-			 * - Bugfix: Reference container, tooltips: fix line wrapping of URLs (hyperlinked or not) based on pattern, not link element.
-			 *
-			 * @since 2.1.4
-					 * @link https://wordpress.org/support/topic/footnotes-on-mobile-phones/#post-13710682
-			 *
-			 * - Bugfix: Reference container, tooltips: URL wrap: exclude image source too, thanks to @bjrnet21 bug report.
-			 *
-			 * @reporter @bjrnet21
-			 * @link https://wordpress.org/support/topic/2-1-4-breaks-on-my-site-images-dont-show/
-			 *
-			 * @since 2.1.5
-			 *
-			 * - Bugfix: Reference container, tooltips: URL wrap: fix regex, thanks to @a223123131 bug report.
-			 *
-			 * @reporter @a223123131
-			 * @link https://wordpress.org/support/topic/broken-layout-starting-version-2-1-4/
-			 *
-			 * @since 2.1.6
-					 *
-			 * Even ARIA labels may take a URL as value, so use \w=[\'"] as a catch-all
-			 *
-			 * - Bugfix: Dashboard: URL wrap: add option to properly enable/disable URL wrap.
-			 *
-			 * @since 2.1.6
-					 *
-			 * - Bugfix: Reference container, tooltips: URL wrap: make the quotation mark optional wrt query parameters, thanks to @spiralofhope2 bug report.
-			 *
-			 * @reporter @spiralofhope2
-			 * @link https://wordpress.org/support/topic/two-links-now-breaks-footnotes-with-blogtext/
-			 *
-			 * @since 2.2.6
-					 *
-			 * - Bugfix: Reference container, tooltips: URL wrap: remove a bug introduced in the regex, thanks to @rjl20 @spaceling @lukashuggenberg @klusik @friedrichnorth @bernardzit bug reports.
-			 *
-			 * @reporter @rjl20
-			 * @link https://wordpress.org/support/topic/two-links-now-breaks-footnotes-with-blogtext/#post-13825479
-			 *
-			 * @reporter @spaceling
-			 * @link https://wordpress.org/support/topic/two-links-now-breaks-footnotes-with-blogtext/#post-13825532
-			 *
-			 * @reporter @lukashuggenberg
-			 * @link https://wordpress.org/support/topic/2-2-6-breaks-all-footnotes/
-			 *
-			 * @reporter @klusik
-			 * @link https://wordpress.org/support/topic/2-2-6-breaks-all-footnotes/#post-13825885
-			 *
-			 * @reporter @friedrichnorth
-			 * @link https://wordpress.org/support/topic/footnotes-dont-show-after-update-to-2-2-6/
-			 *
-			 * @reporter @bernardzit
-			 * @link https://wordpress.org/support/topic/footnotes-dont-show-after-update-to-2-2-6/#post-13826029
-			 *
-			 * @since 2.2.7
-					 *
-			 * - Bugfix: Reference container, tooltips: URL wrap: correctly make the quotation mark optional wrt query parameters, thanks to @spiralofhope2 bug report.
-			 *
-			 * @reporter @spiralofhope2
-			 * @link https://wordpress.org/support/topic/two-links-now-breaks-footnotes-with-blogtext/
-			 *
-			 * @since 2.2.8
-					 * Correct is duplicating the negative lookbehind w/o quotes: '(?<!\w=)'
-			 *
-			 * - Bugfix: Reference container, tooltips: URL wrap: account for RFC 2396 allowed characters in parameter names.
-			 * - Bugfix: Reference container, tooltips: URL wrap: exclude URLs also where the equals sign is preceded by an entity or character reference.
-			 *
-			 * @since 2.2.9
-					 * @link https://stackoverflow.com/questions/814700/http-url-allowed-characters-in-parameter-names
-					 *
-			 * - Bugfix: Reference container, tooltips: URL wrap: support also file transfer protocol URLs.
-			 *
-			 * @since 2.2.10
-					 *
-			 * - Bugfix: Reference container, tooltips: URL wrap: exclude URL pattern as folder name in Wayback Machine URL, thanks to @rumperuu bug report.
-			 *
-			 * @reporter @rumperuu
-			 * @link https://wordpress.org/support/topic/line-wrap-href-regex-bug/
-			 *
-			 * @since 2.5.3
-					 * By adding a 3rd negative lookbehind: '(?<!/)'.
-			 *
-			 * - Bugfix: Reference container, tooltips: URL wrap: account for leading space in value, thanks to @karolszakiel example provision.
-			 *
-			 * @reporter @karolszakiel
-			 * @link https://wordpress.org/support/topic/footnotes-on-mobile-phones/
-			 *
-			 * @since 2.5.4
 			 * The value of an href argument may have leading (and trailing) space.
 			 * @link https://webmasters.stackexchange.com/questions/93540/are-spaces-in-href-valid
 			 * Needs to replicate the relevant negative lookbehind at least with one and with two spaces.
 			 * Note: The WordPress blog engine edits these values, cropping these leading/trailing spaces.
+			 *
+			 * TODO: Split into own method.
 			 */
 			if ( Footnotes_Convert::to_bool( Footnotes_Settings::instance()->get( Footnotes_Settings::C_STR_FOOTNOTE_URL_WRAP_ENABLED ) ) ) {
 
@@ -1885,15 +1407,9 @@ class Footnotes_Parser {
 				// Define excerpt text as footnote text by default.
 				$l_str_excerpt_text = $l_str_footnote_text;
 
-				/**
+				/*
 				 * Tooltip truncation.
 				 *
-				 * - Adding: Tooltips: Read-on button: Label: configurable instead of localizable, thanks to @rovanov example provision.
-				 *
-				 * @reporter @rovanov
-				 * @link https://wordpress.org/support/topic/offset-x-axis-and-offset-y-axis-does-not-working/
-				 *
-				 * @since 2.1.0
 				 * If the tooltip truncation option is enabled, it’s done based on character count,
 				 * and a trailing incomplete word is cropped.
 				 * This is equivalent to the WordPress default excerpt generation, i.e. without a
@@ -1953,7 +1469,7 @@ class Footnotes_Parser {
 						 * @reporter @rovanov
 						 * @link https://wordpress.org/support/topic/offset-x-axis-and-offset-y-axis-does-not-working/
 						 *
-						 * @since 2.1.0
+						 * @since  2.1.0
 						 */
 						$l_str_excerpt_text .= Footnotes_Settings::instance()->get( Footnotes_Settings::C_STR_FOOTNOTES_TOOLTIP_READON_LABEL );
 
@@ -1961,15 +1477,9 @@ class Footnotes_Parser {
 					}
 				}
 
-				/**
+				/*
 				 * Referrers element superscript or baseline.
 				 *
-				 * - Bugfix: Referrers: new setting for vertical align: superscript (default) or baseline (optional), thanks to @cwbayer bug report.
-				 *
-				 * @reporter @cwbayer
-				 * @link https://wordpress.org/support/topic/footnote-number-in-text-superscript-disrupts-leading/
-				 *
-				 * @since 2.1.1
 				 * Define the HTML element to use for the referrers.
 				 */
 				if ( Footnotes_Convert::to_bool( Footnotes_Settings::instance()->get( Footnotes_Settings::C_STR_FOOTNOTES_REFERRER_SUPERSCRIPT_TAGS ) ) ) {
@@ -2007,15 +1517,9 @@ class Footnotes_Parser {
 
 				} else {
 
-					/**
+					/*
 					 * Initialize hard link variables when hard links are disabled.
 					 *
-					 * - Bugfix: Process: initialize hard link address variables to empty string to fix 'undefined variable' bug, thanks to @a223123131 bug report.
-					 *
-					 * @reporter @a223123131
-					 * @link https://wordpress.org/support/topic/wp_debug-php-notice/
-					 *
-					 * @since 2.4.0
 					 * If no hyperlink nor offset anchor is needed, initialize as empty.
 					 */
 					$l_str_footnote_link_argument  = '';
@@ -2034,12 +1538,9 @@ class Footnotes_Parser {
 				// Determine tooltip content.
 				if ( Footnotes_Public::$a_bool_tooltips_enabled ) {
 					$l_str_tooltip_content = $l_bool_has_tooltip_text ? $l_str_tooltip_text : $l_str_excerpt_text;
-					/**
+					/*
 					 * Ensures paragraph separation
 					 *
-					 * @reporter @pewgeuges
-					 * @link https://github.com/markcheret/footnotes/issues/103
-					 * @since 2.7.1
 					 * Ensures that footnotes containing paragraph separators get displayed correctly.
 					 */
 					$l_arr_paragraph_splitters = array( '#(</p *>|<p[^>]*>)#', '#(</div *>|<div[^>]*>)#' );
@@ -2048,11 +1549,7 @@ class Footnotes_Parser {
 					$l_str_tooltip_content = '';
 				}
 
-				/**
-				 * Determine shrink width if alternative tooltips are enabled.
-				 *
-				 * @since 2.5.6
-				 */
+				// Determine shrink width if alternative tooltips are enabled.
 				$l_str_tooltip_style = '';
 				if ( Footnotes_Public::$a_bool_alternative_tooltips_enabled && Footnotes_Public::$a_bool_tooltips_enabled ) {
 					$l_int_tooltip_length = strlen( wp_strip_all_tags( $l_str_tooltip_content ) );
@@ -2125,29 +1622,10 @@ class Footnotes_Parser {
 				$l_int_footnote_index++;
 			}
 
-			/**
+			/*
 			 * Fixes a partial footnotes process outage happening when tooltips are truncated or disabled.
 			 * Fixed a footnotes numbering bug happening under de facto rare circumstances.
 			 *
-			 * - Bugfix: Fixed occasional bug where footnote ordering could be out of sequence
-			 *
-			 * @since 1.6.4
-			 * @committer @dartiss
-			 * @link https://plugins.trac.wordpress.org/browser/footnotes/trunk/class/task.php?rev=1445718 @dartiss’ class/task.php
-			 * @link https://plugins.trac.wordpress.org/log/footnotes/trunk/class/task.php?rev=1445718 @dartiss re-added class/task.php
-			 * @link https://plugins.trac.wordpress.org/browser/footnotes/trunk/class?rev=1445711 class/ w/o task.php
-			 * @link https://plugins.trac.wordpress.org/changeset/1445711/footnotes/trunk/class @dartiss deleted class/task.php
-			 * @link https://plugins.trac.wordpress.org/browser/footnotes/trunk/class/task.php?rev=1026210 @aricura’s latest class/task.php
-			 *
-			 * - Bugfix: Process: fix numbering bug impacting footnote #2 with footnote #1 close to start, thanks to @rumperuu bug report, thanks to @lolzim code contribution.
-			 *
-			 * @reporter @rumperuu
-			 * @link https://wordpress.org/support/topic/footnotes-numbered-incorrectly/
-			 *
-			 * @contributor @lolzim
-			 * @link https://wordpress.org/support/topic/footnotes-numbered-incorrectly/#post-14062032
-			 *
-			 * @since 2.5.5
 			 * This assignment was overridden by another one, causing the algorithm to jump back
 			 * near the post start to a position calculated as the sum of the length of the last
 			 * footnote and the length of the last footnote replace text.
@@ -2157,18 +1635,6 @@ class Footnotes_Parser {
 			 * Deleting both lines instead, to resume the search at the position where it left off,
 			 * would have prevented also the following bug.
 			 *
-			 * - Bugfix: Process: fix issue that caused some footnotes to not be processed, thanks to @docteurfitness @rkupadhya @offpeakdesign bug reports.
-			 *
-			 * @reporter @docteurfitness
-			 * @link https://wordpress.org/support/topic/problem-since-footnotes-2-5-14/
-			 *
-			 * @reporter @rkupadhya
-			 * @link https://wordpress.org/support/topic/adjacent-footnotes-not-working-sometimes/
-			 *
-			 * @reporter @offpeakdesign
-			 * @link https://wordpress.org/support/topic/character-limit-bug/
-			 *
-			 * @since 2.6.6
 			 * The origin of the bug was present since the beginning (v1.0.0).
 			 * For v1.3.2 the wrong code was refactored but remained wrong,
 			 * and was unaffected by the v1.5.0 refactoring.
@@ -2190,15 +1656,9 @@ class Footnotes_Parser {
 	/**
 	 * Generates the reference container.
 	 *
-	 * @since 1.5.0
-	 * @return string
+	 * @since  1.5.0
 	 *
-	 * @since 2.0.0  Update: remove backlink symbol along with column 2 of the reference container
-	 * @since 2.0.3  Bugfix: prepend an arrow on user request
-	 * @since 2.0.6  Bugfix: Reference container: fix line breaking behavior in footnote number clusters.
-	 * @since 2.0.4  Bugfix: restore the arrow select and backlink symbol input settings
-	 * @since 2.1.1  Bugfix: Referrers, reference container: Combining identical footnotes: fix dead links and ensure referrer-backlink bijectivity, thanks to @happyches bug report.
-	 * @since 2.1.1  Bugfix: Reference container: Backlink symbol: make optional, not suggest configuring it to invisible, thanks to @spaceling feedback.
+	 * @return  string
 	 */
 	public function reference_container() {
 
@@ -2207,16 +1667,10 @@ class Footnotes_Parser {
 			return '';
 		}
 
-		/**
+		/*
 		 * Footnote index backlink symbol.
-		 *
-		 * - Bugfix: Reference container: Backlink symbol: make optional, not suggest configuring it to invisible, thanks to @spaceling feedback.
-		 *
-		 * @reporter @spaceling
-		 * @link https://wordpress.org/support/topic/change-the-position-5/page/2/#post-13671138
-		 *
-		 * @since 2.1.1
 		 */
+		 
 		// If the backlink symbol is enabled.
 		if ( Footnotes_Convert::to_bool( Footnotes_Settings::instance()->get( Footnotes_Settings::C_STR_REFERENCE_CONTAINER_BACKLINK_SYMBOL_ENABLE ) ) ) {
 
@@ -2244,18 +1698,9 @@ class Footnotes_Parser {
 
 		}
 
-		/**
+		/*
 		 * Backlink separator.
 		 *
-		 * - Bugfix: Reference container: make separating and terminating punctuation optional and configurable, thanks to @docteurfitness issue report and code contribution.
-		 *
-		 * @reporter @docteurfitness
-		 * @link https://wordpress.org/support/topic/update-2-1-3/
-		 *
-		 * @contributor @docteurfitness
-		 * @link https://wordpress.org/support/topic/update-2-1-3/#post-13704194
-		 *
-		 * @since 2.1.4
 		 * Initially an appended comma was hard-coded in this algorithm for enumerations.
 		 * The comma in enumerations is not universally preferred.
 		 */
@@ -2285,14 +1730,10 @@ class Footnotes_Parser {
 			$l_str_separator = '';
 		}
 
-		/**
+		/*
 		 * Backlink terminator.
 		 *
 		 * Initially a dot was appended in the table row template.
-		 *
-		 * @since 2.0.6 a dot after footnote numbers is discarded as not localizable;
-		 * making it optional was envisaged.
-		 * @since 2.1.4 the terminator is optional, has options, and is configurable.
 		 */
 		if ( Footnotes_Convert::to_bool( Footnotes_Settings::instance()->get( Footnotes_Settings::C_STR_BACKLINKS_TERMINATOR_ENABLED ) ) ) {
 
@@ -2320,13 +1761,9 @@ class Footnotes_Parser {
 			$l_str_terminator = '';
 		}
 
-		/**
+		/*
 		 * Line breaks.
 		 *
-		 * - Bugfix: Reference container: Backlinks: fix stacked enumerations by adding optional line breaks.
-		 *
-		 * @since 2.1.4
-		 *
 		 * The backlinks of combined footnotes are generally preferred in an enumeration.
 		 * But when few footnotes are identical, stacking the items in list form is better.
 		 * Variable number length and proportional character width require explicit line breaks.
@@ -2334,7 +1771,7 @@ class Footnotes_Parser {
 		 */
 		$l_str_line_break = Footnotes_Convert::to_bool( Footnotes_Settings::instance()->get( Footnotes_Settings::C_STR_BACKLINKS_LINE_BREAKS_ENABLED ) ) ? '<br />' : ' ';
 
-		/**
+		/*
 		 * Line breaks for source readability.
 		 *
 		 * For maintenance and support, table rows in the reference container should be
@@ -2343,12 +1780,8 @@ class Footnotes_Parser {
 		 */
 		$l_str_body = "\r\n\r\n";
 
-		/**
+		/*
 		 * Reference container table row template load.
-		 *
-		 * - Bugfix: Reference container: option to restore pre-2.0.0 layout with the backlink symbol in an extra column.
-		 *
-		 * @since 2.1.1
 		 */
 		$l_bool_combine_identical_footnotes = Footnotes_Convert::to_bool( Footnotes_Settings::instance()->get( Footnotes_Settings::C_STR_COMBINE_IDENTICAL_FOOTNOTES ) );
 
@@ -2411,20 +1844,8 @@ class Footnotes_Parser {
 			}
 		}
 
-		/**
+		/*
 		 * Switch backlink symbol and footnote number.
-		 *
-		 * - Bugfix: Reference container: option to append symbol (prepended by default), thanks to @spaceling code contribution.
-		 *
-		 * @since 2.1.1
-		 *
-		 * @contributor @spaceling
-		 * @link https://wordpress.org/support/topic/change-the-position-5/#post-13615994
-		 *
-		 *
-		 * - Bugfix: Reference container: Backlink symbol: support for appending when combining identicals is on.
-		 *
-		 * @since 2.1.4
 		 */
 		$l_bool_symbol_switch = Footnotes_Convert::to_bool( Footnotes_Settings::instance()->get( Footnotes_Settings::C_STR_REFERENCE_CONTAINER_BACKLINK_SYMBOL_SWITCH ) );
 
@@ -2458,18 +1879,14 @@ class Footnotes_Parser {
 
 			if ( self::$a_bool_hard_links_enabled ) {
 
-				/**
+				/*
 				 * Use-Backbutton-Hint tooltip, optional and configurable.
 				 *
-				 * - Update: Reference container: Hard backlinks (optional): optional configurable tooltip hinting to use the backbutton instead, thanks to @theroninjedi47 bug report.
-				 *
-				 * @reporter @theroninjedi47
-				 * @link https://wordpress.org/support/topic/hyperlinked-footnotes-creating-excessive-back-history/
-				 *
-				 * @since 2.5.4
 				 * When hard links are enabled, clicks on the backlinks are logged in the browsing history.
 				 * This tooltip hints to use the backbutton instead, so the history gets streamlined again.
 				 * @link https://wordpress.org/support/topic/making-it-amp-compatible/#post-13837359
+				 *
+				 * @since  2.5.4
 				 */
 				if ( Footnotes_Convert::to_bool( Footnotes_Settings::instance()->get( Footnotes_Settings::C_STR_FOOTNOTES_BACKLINK_TOOLTIP_ENABLE ) ) ) {
 					$l_str_use_backbutton_hint  = ' title="';
@@ -2505,19 +1922,16 @@ class Footnotes_Parser {
 				$l_str_footnote_anchor_element = '';
 			}
 
-			/**
+			/*
 			 * Support for combining identicals: compose enumerated backlinks.
 			 *
-			 * - Bugfix: Referrers, reference container: Combining identical footnotes: fix dead links and ensure referrer-backlink bijectivity, thanks to @happyches bug report.
-			 *
-			 * @reporter @happyches
-			 * @link https://wordpress.org/support/topic/custom-css-for-jumbled-references/
-			 *
-			 * @since 2.1.1
 			 * Prepare to have single footnotes, where the click event and
 			 * optional hard link need to be set to cover the table cell,
 			 * for better usability and UX.
+			 *
+			 * @since  2.1.1
 			 */
+			 
 			// Set a flag to check for the combined status of a footnote item.
 			$l_bool_flag_combined = false;
 
@@ -2546,7 +1960,7 @@ class Footnotes_Parser {
 				/*
 				 * The click event goes in the table cell if footnote remains single.
 				 */
-				// Reverted wrong linting.
+				 
 				$l_str_backlink_event = ' onclick="footnote_moveToAnchor_';
 
 				$l_str_backlink_event .= self::$a_int_post_id;
@@ -2721,14 +2135,9 @@ class Footnotes_Parser {
 		// Streamline.
 		$l_bool_collapse_default = Footnotes_Convert::to_bool( Footnotes_Settings::instance()->get( Footnotes_Settings::C_STR_REFERENCE_CONTAINER_COLLAPSE ) );
 
-		/**
+		/*
 		 * Reference container label.
 		 *
-		 * - Bugfix: Reference container: Label: set empty label to U+202F NNBSP for more robustness, thanks to @lukashuggenberg feedback.
-		 *
-		 * @reporter @lukashuggenberg
-		 *
-		 * @since 2.4.0
 		 * Themes may drop-cap a first letter of initial paragraphs, like this label.
 		 * In case of empty label that would apply to the left half button character.
 		 * Hence the point in setting an empty label to U+202F NARROW NO-BREAK SPACE.
diff --git a/src/public/class-footnotes-public.php b/src/public/class-footnotes-public.php
index 7df55d1..c169c00 100644
--- a/src/public/class-footnotes-public.php
+++ b/src/public/class-footnotes-public.php
@@ -2,101 +2,106 @@
 /**
  * The public-facing functionality of the plugin.
  *
- * @since      2.8.0
- *
- * @package    footnotes
- * @subpackage public
+ * @package  footnotes\public
+ * @since  2.8.0
  */
 
 /**
- * The public-facing functionality of the plugin.
+ * Class provide all admin-specific functionality of the plugin.
  *
  * Defines the plugin name, version, and enqueues all public-facing stylesheets
  * and JavaScript.
  *
- * @package    footnotes
- * @subpackage public
+ * @package  footnotes\public
+ * @since  2.8.0
  */
 class Footnotes_Public {
 
 	/**
 	 * The ID of this plugin.
 	 *
-	 * @since    2.8.0
-	 * @access   private
-	 * @var      string    $plugin_name    The ID of this plugin.
+	 * @since  2.8.0
+	 
+	 * @access  private
+	 * @var  string  $plugin_name  The ID of this plugin.
 	 */
 	private $plugin_name;
 
 	/**
 	 * The version of this plugin.
 	 *
-	 * @since    2.8.0
-	 * @access   private
-	 * @var      string    $version    The current version of this plugin.
+	 * @since  2.8.0
+	
+	 * @access  private
+	 * @var  string  $version  The current version of this plugin.
 	 */
 	private $version;
 
 	/**
 	 * The reference container widget.
 	 *
-	 * @since 2.8.0
-	 * @var Footnotes_Widget_Reference_Container $reference_container_widget The reference container widget
+	 * @since  2.8.0
+	 *
+	 * @var  Footnotes_Widget_Reference_Container  $reference_container_widget  The reference container widget
 	 */
 	private $reference_container_widget;
 
 	/**
 	 * The footnote parser.
 	 *
-	 * @since 1.5.0
-	 * @since 2.8.0 Moved from `Footnotes` to `Footnotes_Public` class.
-	 * @var Footnote_Parser $task The Plugin task.
+	 * @since  1.5.0
+	 * @since  2.8.0  Moved from {@see Footnotes} to {@see Footnotes_Public}.
+	 *
+	 * @var  Footnotes_Parser  $task  The Plugin task.
 	 */
 	public $a_obj_task = null;
 
 	/**
 	 * Flag for using tooltips.
 	 *
-	 * @since 2.4.0
-	 * @since 2.8.0 Moved from `Footnotes` to `Footnotes_Public` class.
-	 * @var bool $tooltips_enabled Whether tooltips are enabled or not.
+	 * @since  2.4.0
+	 * @since  2.8.0  Moved from {@see Footnotes} to {@see Footnotes_Public}.
+	 *
+	 * @var  bool  $tooltips_enabled  Whether tooltips are enabled or not.
 	 */
 	public static $a_bool_tooltips_enabled = false;
 
 	/**
 	 * Allows to determine whether alternative tooltips are enabled.
 	 *
-	 * @since 2.1.1
-	 * @since 2.8.0 Moved from `Footnotes` to `Footnotes_Public` class.
-	 * @var bool
+	 * @since  2.1.1
+	 * @since  2.8.0  Moved from {@see Footnotes} to {@see Footnotes_Public}.
+	 *
+	 * @var  bool
 	 */
 	public static $a_bool_alternative_tooltips_enabled = false;
 
 	/**
 	 * Allows to determine whether AMP compatibility mode is enabled.
 	 *
-	 * @since 2.6.0  (release)
-	 * @since 2.8.0 Moved from `Footnotes` to `Footnotes_Public` class.
-	 * @var bool
+	 * @since  2.6.0
+	 * @since  2.8.0  Moved from {@see Footnotes} to {@see Footnotes_Public}.
+	 *
+	 * @var  bool
 	 */
 	public static $a_bool_amp_enabled = false;
 
 	/**
 	 * Allows to determine the script mode among jQuery or plain JS.
 	 *
-	 * @since 2.5.6
-	 * @since 2.8.0 Moved from `Footnotes` to `Footnotes_Public` class.
-	 * @var str   'js'      Plain JavaScript.
-	 *            'jquery'  Use jQuery libraries.
+	 * @since  2.5.6
+	 * @since  2.8.0  Moved from {@see Footnotes} to {@see Footnotes_Public}.
+	 *
+	 * @var  string  ‘js’ to use plain JavaScript, ‘jquery’ to use jQuery.
 	 */
 	public static $a_str_script_mode = 'js';
 
 	/**
 	 * Initialize the class and set its properties.
 	 *
-	 * @since    2.8.0
-	 * @param    string $plugin_name       The name of this plugin.
-	 * @param    string $version    The version of this plugin.
+	 * @since  2.8.0
+	 * @param  string  $plugin_name  The name of this plugin.
+	 * @param  string  $version  The version of this plugin.
 	 */
 	public function __construct( $plugin_name, $version ) {
 
@@ -118,11 +123,10 @@ class Footnotes_Public {
 	 * Include the following files that provide the public-facing functionality
 	 * of this plugin:
 	 *
-	 * - `Footnotes_Parser`. Parses Posts and Pages for footnote shortcodes.
-	 * - `Footnotes_Widget_Reference_Container`. Defines the Reference Container widget.
+	 * - {@see Footnotes_Parser}: parses Posts and Pages for footnote shortcodes; and
+	 * - {@see Footnotes_Widget_Reference_Container}: defines the Reference Container widget.
 	 *
-	 * @since    2.8.0
-	 * @access   private
+	 * @since  2.8.0
 	 */
 	private function load_dependencies() {
 		// TODO: neaten up and document once placements and names are settled.
@@ -141,12 +145,12 @@ class Footnotes_Public {
 	/**
 	 * Register the stylesheets for the public-facing side of the site.
 	 *
-	 * Enables enqueuing the formatted individual stylesheets if `PRODCUTION_ENV`
-	 * is true (set in `footnotes.php`).
+	 * Enables enqueuing the formatted individual stylesheets if {@see PRODUCTION_ENV}
+	 * is `true`.
 	 *
-	 * @since 1.5.0
-	 * @since 2.5.5 Change stylesheet scheme.
-	 * @since 2.8.0 Moved from `Footnotes` to `Footnotes_Public` class.
+	 * @since  1.5.0
+	 * @since  2.5.5  Change stylesheet schema.
+	 * @since  2.8.0  Moved from {@see Footnotes} to {@see Footnotes_Public}.
 	 */
 	public function enqueue_styles() {
 		if ( PRODUCTION_ENV ) {
@@ -207,22 +211,20 @@ class Footnotes_Public {
 	/**
 	 * Register the JavaScript for the public-facing side of the site.
 	 *
-	 * @since 1.5.0
-	 * @since 2.0.0 Add jQueryUI dependency.
-	 * @since 2.1.2 Add jQuery Tools dependency.
-	 * @since 2.5.6 Add jQuery dependency.
-	 * @since 2.8.0 Moved from `Footnotes` to `Footnotes_Public` class.
+	 * @since  1.5.0
+	 * @since  2.0.0  Add jQueryUI dependency.
+	 * @since  2.1.2  Add jQuery Tools dependency.
+	 * @since  2.5.6  Add jQuery dependency.
+	 * @since  2.8.0  Moved from {@see Footnotes} to {@see Footnotes_Public}.
 	 */
 	public function enqueue_scripts() {
-		/**
+		/*
 		 * Enqueues the jQuery library registered by WordPress.
 		 *
 		 * As jQuery is also used for animated scrolling, it was loaded by default.
 		 * The function `wp_enqueue_script()` avoids loading the same library multiple times.
 		 * After adding the alternative reference container, jQuery has become optional,
 		 * but still enabled by default.
-		 *
-		 * @since 2.5.6
 		 */
 		if ( ! self::$a_bool_amp_enabled ) {
 
@@ -233,24 +235,20 @@ class Footnotes_Public {
 			}
 
 			if ( self::$a_bool_tooltips_enabled && ! self::$a_bool_alternative_tooltips_enabled ) {
-				/**
+				/*
 				 * Enqueues the jQuery Tools library shipped with the plugin.
 				 *
-				 * Redacted jQuery.browser, completed minification;
+				 * Redacted `jQuery.browser`, completed minification;
 				 * see full header in `public/js/jquery.tools.js`.
-				 * No '-js' in the handle, is appended automatically.
+				 * No ‘-js’ in the handle, is appended automatically.
 				 * Deferring to the footer breaks jQuery tooltip display.
-				 *
-				 * @since 2.1.2
 				 */
 				wp_enqueue_script( $this->plugin_name, plugin_dir_url( __FILE__ ) . 'js/jquery.tools' . ( ( PRODUCTION_ENV ) ? '.min' : '' ) . '.js', array(), '1.2.7.redacted.2', false );
 
-				/**
+				/*
 				 * Enqueues some jQuery UI libraries registered by WordPress.
 				 *
 				 * If alternative tooltips are enabled, these libraries are not needed.
-				 *
-				 * @since 2.0.0
 				 */
 				wp_enqueue_script( 'jquery-ui-core' );
 				wp_enqueue_script( 'jquery-ui-widget' );
@@ -265,8 +263,8 @@ class Footnotes_Public {
 	/**
 	 * Register the widget(s) for the public-facing side of the site.
 	 *
-	 * @since 1.5.0
-	 * @since 2.8.0 Moved to `Footnotes_Public` class.
+	 * @since  1.5.0
+	 * @since  2.8.0  Moved from {@see Footnotes} to {@see Footnotes_Public}.
 	 */
 	public function register_widgets() {
 		register_widget( $this->reference_container_widget );
diff --git a/src/public/widget/class-footnotes-widget-base.php b/src/public/widget/class-footnotes-widget-base.php
index e7b8e63..584d6b8 100644
--- a/src/public/widget/class-footnotes-widget-base.php
+++ b/src/public/widget/class-footnotes-widget-base.php
@@ -1,73 +1,74 @@
 <?php
 /**
- * Widget base.
+ * Widgets: Footnotes_Widget_Base class
  *
+ * The Widget subpackage is composed of the {@see Footnotes_Widget_Base}
+ * abstract class, which is extended by the {@see Footnotes_Widget_Reference_Container}
+ * sub-class.
+ *
+ * @package  footnotes\public\widget
  * @since 1.5.0
- * @since 1.6.4  Update: replace deprecated function WP_Widget() with recommended __construct(), thanks to @dartiss code contribution.
- *
- * @package footnotes
- * @subpackage public_widget
  */
 
 /**
- * Base Class for all Plugin Widgets. Registers each Widget to WordPress.
- * The following Methods MUST be overwritten in each sub class:
- * **public function widget($args, $instance)** -> echo the Widget Content
- * **public function form($instance)** -> echo the Settings of the Widget
+ * Base class to be extended by all widget sub-classes.
  *
- * @author Stefan Herndler
- * @since 1.5.0
+ * Any sub-class must override the appropriate method(s) provided by
+ * {@link https://developer.wordpress.org/reference/classes/wp_widget/#description `WP_Widget`}.
  *
- * @package    footnotes
- * @subpackage public_widget
+ * @abstract
+ *
+ * @package  footnotes\public\widget
+ * @since  1.5.0
+ * @todo  Review implemenation of Widgets API.
  */
 abstract class Footnotes_Widget_Base extends WP_Widget {
 
 	/**
 	 * Returns an unique ID as string used for the Widget Base ID.
 	 *
-	 * @since 1.5.0
-	 * @return string
+	 * @abstract
+	 * @since  1.5.0
+	 *
+	 * @return  string
 	 */
 	abstract protected function get_id();
 
 	/**
 	 * Returns the Public name of child Widget to be displayed in the Configuration page.
 	 *
-	 * @since 1.5.0
-	 * @return string
+	 * @abstract
+	 * @since  1.5.0
+	 *
+	 * @return  string
 	 */
 	abstract protected function get_name();
 
 	/**
 	 * Returns the Description of the child widget.
 	 *
-	 * @since 1.5.0
-	 * @return string
+	 * @abstract
+	 * @since  1.5.0
+	 *
+	 * @return  string
 	 */
 	abstract protected function get_description();
 
 	/**
 	 * Returns the width of the Widget. Default width is 250 pixel.
 	 *
-	 * @since 1.5.0
-	 * @return int
+	 * @since  1.5.0
+	 *
+	 * @return  int
 	 */
 	protected function get_widget_width() {
 		return 250;
 	}
-
+	
 	/**
-	 * Class Constructor. Registers the child Widget to WordPress.
+	 * Registers the child Widget to WordPress.
 	 *
-	 * @since 1.5.0
-	 *
-	 * - Update: replace deprecated function WP_Widget() with recommended __construct(), thanks to @dartiss code contribution.
-	 *
-	 * @since 1.6.4
-	 * @contributor @dartiss
-	 * @link https://plugins.trac.wordpress.org/browser/footnotes/trunk/class/widgets/base.php?rev=1445720
-	 * “The called constructor method for WP_Widget in Footnotes_Widget_ReferenceContainer is deprecated since version 4.3.0! Use __construct() instead.”
+	 * @since  1.5.0
 	 */
 	public function __construct() {
 		$l_arr_widget_options  = array(
@@ -86,4 +87,5 @@ abstract class Footnotes_Widget_Base extends WP_Widget {
 			$l_arr_control_options // Optional Widget Control Options.
 		);
 	}
+	
 }
diff --git a/src/public/widget/class-footnotes-widget-reference-container.php b/src/public/widget/class-footnotes-widget-reference-container.php
index faf6216..d4bd527 100644
--- a/src/public/widget/class-footnotes-widget-reference-container.php
+++ b/src/public/widget/class-footnotes-widget-reference-container.php
@@ -1,11 +1,13 @@
 <?php // phpcs:disable WordPress.Security.EscapeOutput.OutputNotEscaped
 /**
- * Includes the Plugin Widget to put the Reference Container to the Widget area.
+ * Widgets: Footnotes_Widget_Reference_Container class
  *
- * @since 1.5.0
+ * The Widget subpackage is composed of the {@see Footnotes_Widget_Base}
+ * abstract class, which is extended by the {@see Footnotes_Widget_Reference_Container}
+ * sub-class.
  *
- * @package footnotes
- * @subpackage public_widget
+ * @package  footnotes\public\widget
+ * @since  1.5.0
  */
 
 require_once plugin_dir_path( dirname( __FILE__ ) ) . 'widget/class-footnotes-widget-base.php';
@@ -13,27 +15,29 @@ require_once plugin_dir_path( dirname( __FILE__ ) ) . 'widget/class-footnotes-wi
 /**
  * Registers a Widget to put the Reference Container to the widget area.
  *
- * @since 1.5.0
- *
- * @package    footnotes
- * @subpackage public_widget
+ * @package  footnotes\public\widget
+ * @since  1.5.0
+ * @see  Footnotes_Widget_Base
+ * @todo  Review implemenation of Widgets API.
  */
 class Footnotes_Widget_Reference_Container extends Footnotes_Widget_Base {
 
 	/**
 	 * The ID of this plugin.
 	 *
-	 * @since    2.8.0
-	 * @access   private
-	 * @var      string    $plugin_name    The ID of this plugin.
+	 * @access  private
+	 * @since  2.8.0
+	 * @see  Footnotes::$plugin_name
+	 * @var  string  $plugin_name  The ID of this plugin.
 	 */
 	private $plugin_name;
 
 	/**
 	 * Initialize the class and set its properties.
 	 *
-	 * @since    2.8.0
-	 * @param    string $plugin_name       The name of this plugin.
+	 * @since  2.8.0
+	 *
+	 * @param  string  $plugin_name  The name of this plugin.
 	 */
 	public function __construct( $plugin_name ) {
 		parent::__construct();
@@ -43,8 +47,10 @@ class Footnotes_Widget_Reference_Container extends Footnotes_Widget_Base {
 	/**
 	 * Returns an unique ID as string used for the Widget Base ID.
 	 *
-	 * @since 1.5.0
-	 * @return string
+	 * @see  Footnotes_Widget_Base::get_id()
+	 * @since  1.5.0
+	 *
+	 * @return  string
 	 */
 	protected function get_id() {
 		return 'footnotes_widget';
@@ -53,8 +59,10 @@ class Footnotes_Widget_Reference_Container extends Footnotes_Widget_Base {
 	/**
 	 * Returns the Public name of the Widget to be displayed in the Configuration page.
 	 *
-	 * @since 1.5.0
-	 * @return string
+	 * @see  Footnotes_Widget_Base::get_name()
+	 * @since  1.5.0
+	 *
+	 * @return  string
 	 */
 	protected function get_name() {
 		return $this->plugin_name;
@@ -63,34 +71,35 @@ class Footnotes_Widget_Reference_Container extends Footnotes_Widget_Base {
 	/**
 	 * Returns the Description of the child widget.
 	 *
-	 * @since 1.5.0
-	 * @return string
+	 * @see  Footnotes_Widget_Base::get_description()
+	 * @since  1.5.0
 	 *
-	 * Edit: curly quotes 2.2.0
+	 * @return  string
 	 */
 	protected function get_description() {
-		return __( 'The widget defines the position of the reference container if set to “widget area”.', 'footnotes' );
+		return __( 'The widget defines the position of the reference container if set to &ldquo;widget area&rdquo;.', 'footnotes' );
 	}
 
 	/**
 	 * Outputs the Settings of the Widget.
 	 *
-	 * @since 1.5.0
-	 * @param mixed $instance The instance of the widget.
-	 * @return void
+	 * @link  https://developer.wordpress.org/reference/classes/wp_widget/form/ `WP_Widget::form()`
+	 * @since  1.5.0
 	 *
-	 * Edit: curly quotes 2.2.0
+	 * @param  mixed  $instance  The instance of the widget.
 	 */
 	public function form( $instance ) {
-		echo __( 'The widget defines the position of the reference container if set to “widget area”.', 'footnotes' );
+		echo __( 'The widget defines the position of the reference container if set to &ldquo;widget area&rdquo;.', 'footnotes' );
 	}
 
 	/**
 	 * Outputs the Content of the Widget.
 	 *
-	 * @since 1.5.0
-	 * @param mixed $args     The widget's arguments.
-	 * @param mixed $instance The instance of the widget.
+	 * @link  https://developer.wordpress.org/reference/classes/wp_widget/widget/ `WP_Widget::widget()`
+	 * @since  1.5.0
+	 *
+	 * @param  mixed  $args  The widget's arguments.
+	 * @param  mixed  $instance  The instance of the widget.
 	 */
 	public function widget( $args, $instance ) {
 		global $footnotes;