diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index c8e50c3..557eaf6 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -3,22 +3,30 @@ name: CI test suite
 on:
   pull_request:
     paths:
+      - '.github/workflows/**'
       - 'composer.*'
       - phpcs.xml
       - phpstan.neon
       - '**.php'
   push:
     paths:
+      - '.github/workflows/**'
       - 'composer.*'
       - phpcs.xml
       - phpstan.neon
       - '**.php'
 
+# Cancels all previous workflow runs for the same branch that have not yet completed.
+concurrency:
+  # The concurrency group contains the workflow name and the branch name.
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   build:
     strategy:
       matrix:
-        php-versions: ['8.0', '7.4', '7.3']
+        php-versions: ['8.1', '8.0', '7.4', '7.3']
 
     runs-on: ubuntu-latest
 
@@ -35,7 +43,7 @@ jobs:
       run: composer validate
 
     - name: Install dependencies
-      run: composer install --prefer-dist --no-progress --no-suggest --classmap-authoritative
+      uses: ramsey/composer-install@v1
 
     - name: Run CI test suite
       run: composer run-script ci
diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 0000000..b2e61c1
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,33 @@
+# BC Security Changelog
+
+## Upcoming version 0.19.0 (2022-06-02)
+
+### Added
+
+* PHP 8.1 is supported [#116](https://github.com/chesio/bc-security/issues/116).
+* WordPress versions 5.9 and 6.0 are supported [#121](https://github.com/chesio/bc-security/issues/121) and [#127](https://github.com/chesio/bc-security/issues/127).
+* An option to restrict login options has been implemented: login via email or login via username can be disabled [#123](https://github.com/chesio/bc-security/issues/123).
+* [Changelog.md](CHANGELOG.md) has been added [#125](https://github.com/chesio/bc-security/issues/125).
+
+### Removed
+
+* "Check auth cookies" setting has been removed [#124](https://github.com/chesio/bc-security/issues/124).
+
+## Version 0.18.1 (2021-12-29)
+
+### Fixed
+
+* EOL dates for PHP versions in PHP version check has been updated: EOL date for PHP 7.3 has been removed, EOL date for PHP 8.1 has been added [#115](https://github.com/chesio/bc-security/issues/115).
+
+## Version 0.18.0 (2021-11-30)
+
+### Added
+
+* PHP 8.0 is supported [#104](https://github.com/chesio/bc-security/issues/104).
+* Alert about "No removed plugins installed" has more information [#107](https://github.com/chesio/bc-security/issues/107).
+* Detection of plugins installed from WordPress Directory has been improved [#112](https://github.com/chesio/bc-security/issues/112).
+* On WordPress 5.8 and newer the plugin cannot be accidentally overriden from WordPress.org Plugins Directory [#111](https://github.com/chesio/bc-security/issues/111).
+
+## Older releases
+
+Notes on changes in all releases can be found [here](https://github.com/chesio/bc-security/releases).
diff --git a/README.md b/README.md
index 875afcb..00ab363 100644
--- a/README.md
+++ b/README.md
@@ -76,13 +76,13 @@ Since security measures for development instalations do not have to be as strict
 Basic checks cover common security practices. They do not require any information from third party sources to proceed and thus do not leak any information about your website:
 
 1. Is backend editing of plugin and theme PHP files disabled?
-1. Are directory listings disabled?
-1. Is execution of PHP files from uploads directory forbidden?
-1. Is display of PHP errors off by default? This check is only run in *live environment*.
-1. Is error log file not publicly available? This check is only run if both `WP_DEBUG` and `WP_DEBUG_LOG` constants are set to true.
-1. Are there no common usernames like admin or administrator on the system?
-1. Are user passwords hashed with [more secure hashing algorithm](https://roots.io/improving-wordpress-password-security/) than MD5 used by [WordPress by default](https://core.trac.wordpress.org/ticket/21022)?
-1. Is PHP version still supported?
+2. Are directory listings disabled?
+3. Is execution of PHP files from uploads directory forbidden?
+4. Is display of PHP errors off by default? This check is only run in *live environment*.
+5. Is error log file not publicly available? This check is only run if both `WP_DEBUG` and `WP_DEBUG_LOG` constants are set to true.
+6. Are there no common usernames like admin or administrator on the system?
+7. Are user passwords hashed with [more secure hashing algorithm](https://roots.io/improving-wordpress-password-security/) than MD5 used by [WordPress by default](https://core.trac.wordpress.org/ticket/21022)?
+8. Is PHP version still supported?
 
 #### Advanced checks
 
@@ -94,7 +94,7 @@ In the moment, list of installed plugins (but only those with _readme.txt_ file)
 
 WordPress core files verification is done in two phases:
 1. Official md5 checksums from WordPress.org are used to determine if any of core files have been modified.
-1. All files in root directory, _wp-admin_ directory (including subdirectories) and _wp-includes_ directory (including subdirectories) are checked against official checksums list in order to find out any unknown files.
+2. All files in root directory, _wp-admin_ directory (including subdirectories) and _wp-includes_ directory (including subdirectories) are checked against official checksums list in order to find out any unknown files.
 
 The check uses the same checksums API as [`core verify-checksums`](https://developer.wordpress.org/cli/commands/core/verify-checksums/) command from [WP-CLI](https://wp-cli.org/).
 
@@ -120,10 +120,11 @@ Both basic and advanced checks can be run manually from a dedicated page in back
 
 BC Security allows you to:
 1. Disable pingbacks
-1. Disable XML RPC methods that require authentication
-1. Disable application passwords
-1. Prevent usernames discovery via [REST API requests](https://developer.wordpress.org/rest-api/reference/users/) and [username enumeration](https://hackertarget.com/wordpress-user-enumeration/)
-1. Check and/or validate user passwords using [Pwned Passwords](https://haveibeenpwned.com/Passwords) database and [API](https://haveibeenpwned.com/API/v2#PwnedPasswords)
+2. Disable XML RPC methods that require authentication
+3. Disable application passwords
+4. Prevent usernames discovery via [REST API requests](https://developer.wordpress.org/rest-api/reference/users/) and [username eumeration](https://hackertarget.com/wordpress-user-enumeration/)
+5. Disable login with email or login with username to reduce risk from brute-force or [credential stuffing attacks](https://owasp.org/www-community/attacks/Credential_stuffing).
+6. Check and/or validate user passwords using [Pwned Passwords](https://haveibeenpwned.com/Passwords) database and [API](https://haveibeenpwned.com/API/v2#PwnedPasswords)
 
 #### Passwords check
 
@@ -136,7 +137,7 @@ Passwords are validated on user creation, password change or password reset. If
 ### Login security
 
 1. BC Security allows you to limit number of login attempts from single IP address. Implementation of this feature is heavily inspired by popular [Limit Login Attempts](https://wordpress.org/plugins/limit-login-attempts/) plugin with an extra feature of immediate blocking of specific usernames (like _admin_ or _administrator_).
-1. BC Security offers an option to only display generic error message as a result of failed login attempt when wrong username, email or password is provided.
+2. BC Security offers an option to only display generic error message as a result of failed login attempt when wrong username, email or password is provided.
 
 ### IP blacklist
 
@@ -149,12 +150,12 @@ Out-dated records are automatically removed from the list by WP-Cron job schedul
 BC Security allows to send automatic email notification to configured recipients on following occasions:
 
 1. WordPress update is available.
-1. Plugin update is available.
-1. Theme update is available.
-1. User with administrator privileges has logged in.
-1. Known IP address has been locked out (see note below).
-1. [Checklist monitoring](#checklist-monitoring) triggers an alert. Note: there is one notification sent if any of basic checks fails, but separate notification is sent if any of advanced checks fails.
-1. BC Security plugin has been deactivated.
+2. Plugin update is available.
+3. Theme update is available.
+4. User with administrator privileges has logged in.
+5. Known IP address has been locked out (see note below).
+6. [Checklist monitoring](#checklist-monitoring) triggers an alert. Note: there is one notification sent if any of basic checks fails, but separate notification is sent if any of advanced checks fails.
+7. BC Security plugin has been deactivated.
 
 Note: _Known IP address_ is an IP address from which a successful login attempt had been previously made. Information about successful login attempts is fetched from [event logs](#events-logging).
 
@@ -165,8 +166,8 @@ You can mute all email notifications by setting constant `BC_SECURITY_MUTE_NOTIF
 BC Security logs both short and long lockout events (see [Login Security](#login-security) feature). Also, the following events triggered by WordPress core are logged:
 
 1. Attempts to authenticate with bad cookie
-1. Failed and successful login attempts
-1. Requests that result in 404 page
+2. Failed and successful login attempts
+3. Requests that result in 404 page
 
 Logs are stored in database and can be viewed on backend. Logs are automatically deleted based on their age and overall size: by default no more than 20 thousands of records are kept and any log records older than 365 days are removed, but these limits can be configured.
 
@@ -202,4 +203,4 @@ Some of the modules listed above come with settings panel. Further customization
 ## Alternatives (and why I do not use them)
 
 1. [Wordfence Security](https://wordpress.org/plugins/wordfence/) - likely the current number one plugin for WordPress Security. My problem with Wordfence is that _"when you use [Wordfence], statistics about your website visitors are automatically collected"_ (see the full [Terms of Use and Privacy Policy](https://www.wordfence.com/terms-of-use-and-privacy-policy/)). In other words, in order to offer some of its great features, Wordfence is [phoning home](https://en.wikipedia.org/wiki/Phoning_home).
-1. [All In One WP Security & Firewall](https://wordpress.org/plugins/all-in-one-wp-security-and-firewall/) - another very popular security plugin for WordPress. I have used AIOWPSF for quite some time; it has a lot of features, but also lot of small bugs (sometimes [not that small](https://sumofpwn.nl/advisory/2016/cross_site_scripting_in_all_in_one_wp_security___firewall_wordpress_plugin.html)). I [used to contribute](https://github.com/Arsenal21/all-in-one-wordpress-security/commits?author=chesio) to the plugin, but the codebase is [rather messy](https://github.com/Arsenal21/all-in-one-wordpress-security/pull/34) and after some time I got tired struggling with it.
+2. [All In One WP Security & Firewall](https://wordpress.org/plugins/all-in-one-wp-security-and-firewall/) - another very popular security plugin for WordPress. I have used AIOWPSF for quite some time; it has a lot of features, but also lot of small bugs (sometimes [not that small](https://sumofpwn.nl/advisory/2016/cross_site_scripting_in_all_in_one_wp_security___firewall_wordpress_plugin.html)). I [used to contribute](https://github.com/Arsenal21/all-in-one-wordpress-security/commits?author=chesio) to the plugin, but the codebase is [rather messy](https://github.com/Arsenal21/all-in-one-wordpress-security/pull/34) and after some time I got tired struggling with it.
diff --git a/bc-security.php b/bc-security.php
index 427dc73..58da6c7 100644
--- a/bc-security.php
+++ b/bc-security.php
@@ -4,12 +4,12 @@
  * Plugin Name: BC Security
  * Plugin URI: https://github.com/chesio/bc-security
  * Description: Helps keeping WordPress websites secure.
- * Version: 0.18.1
+ * Version: 0.19.0
  * Author: Česlav Przywara <ceslav@przywara.cz>
  * Author URI: https://www.chesio.com
  * Requires PHP: 7.3
  * Requires WP: 5.5
- * Tested up to: 5.8
+ * Tested up to: 6.0
  * Text Domain: bc-security
  * GitHub Plugin URI: https://github.com/chesio/bc-security
  * Update URI: https://github.com/chesio/bc-security
@@ -53,13 +53,18 @@
 // Register autoloader for this plugin.
 require_once __DIR__ . '/autoload.php';
 
-// Construct plugin instance.
-$bc_security = new \BlueChip\Security\Plugin(__FILE__, $GLOBALS['wpdb']);
+return call_user_func(function () {
+    // Construct plugin instance.
+    $bc_security = new \BlueChip\Security\Plugin(__FILE__, $GLOBALS['wpdb']);
 
-// Register activation hook.
-register_activation_hook(__FILE__, [$bc_security, 'activate']);
-// Register deactivation hook.
-register_deactivation_hook(__FILE__, [$bc_security, 'deactivate']);
+    // Register activation hook.
+    register_activation_hook(__FILE__, [$bc_security, 'activate']);
+    // Register deactivation hook.
+    register_deactivation_hook(__FILE__, [$bc_security, 'deactivate']);
 
-// Load the plugin.
-$bc_security->load();
+    // Boot up the plugin immediately after all plugins are loaded.
+    add_action('plugins_loaded', [$bc_security, 'load'], 0, 0);
+
+    // Return the instance.
+    return $bc_security;
+});
diff --git a/classes/BlueChip/Security/Admin.php b/classes/BlueChip/Security/Admin.php
index 243a14c..beff268 100644
--- a/classes/BlueChip/Security/Admin.php
+++ b/classes/BlueChip/Security/Admin.php
@@ -28,6 +28,7 @@ class Admin
      * Initialize admin area of the plugin.
      *
      * @param string $plugin_filename
+     *
      * @return self
      */
     public function init(string $plugin_filename): self
@@ -43,6 +44,7 @@ public function init(string $plugin_filename): self
      * Add a page to plugin dashboard menu.
      *
      * @param \BlueChip\Security\Core\Admin\AbstractPage $page
+     *
      * @return self
      */
     public function addPage(Core\Admin\AbstractPage $page): self
@@ -55,7 +57,7 @@ public function addPage(Core\Admin\AbstractPage $page): self
     /**
      * @action https://developer.wordpress.org/reference/hooks/admin_init/
      */
-    public function initAdminPages()
+    public function initAdminPages(): void
     {
         foreach ($this->pages as $page) {
             $page->initPage();
@@ -68,7 +70,7 @@ public function initAdminPages()
      *
      * @action https://developer.wordpress.org/reference/hooks/admin_menu/
      */
-    public function makeAdminMenu()
+    public function makeAdminMenu(): void
     {
         if (empty($this->pages)) {
             // No pages registered = no pages (no menu) to show.
@@ -80,11 +82,11 @@ public function makeAdminMenu()
 
         // Add (main) menu page
         add_menu_page(
-            '', // obsolete as soon as page has subpages
+            '', // Page title is obsolete as soon as page has subpages.
             _x('BC Security', 'Dashboard menu item name', 'bc-security'),
             self::CAPABILITY,
             $main_page->getSlug(),
-            '', // obsolete as soon as page has subpages
+            '__return_empty_string', // Page content is obsolete as soon as page has subpages. Passing an empty string would prevent the callback being registered at all, but it breaks static analysis - see: https://core.trac.wordpress.org/ticket/52539
             self::ICON
         );
 
@@ -110,8 +112,9 @@ public function makeAdminMenu()
      *
      * @filter https://developer.wordpress.org/reference/hooks/plugin_action_links_plugin_file/
      *
-     * @param array $links
-     * @return array
+     * @param string[] $links
+     *
+     * @return string[]
      */
     public function filterActionLinks(array $links): array
     {
@@ -130,6 +133,7 @@ public function filterActionLinks(array $links): array
      * Format counter indicator for menu title for given $page.
      *
      * @param \BlueChip\Security\Core\Admin\AbstractPage $page
+     *
      * @return string
      */
     private function renderCounter(Core\Admin\AbstractPage $page): string
diff --git a/classes/BlueChip/Security/Core/Admin/AbstractPage.php b/classes/BlueChip/Security/Core/Admin/AbstractPage.php
index 20c4b1c..81660e6 100644
--- a/classes/BlueChip/Security/Core/Admin/AbstractPage.php
+++ b/classes/BlueChip/Security/Core/Admin/AbstractPage.php
@@ -31,7 +31,7 @@ abstract class AbstractPage
     /**
      * Output page contents.
      */
-    abstract public function printContents();
+    abstract public function printContents(): void;
 
 
     /**
@@ -87,7 +87,7 @@ public static function getPageUrl(): string
      *
      * @param string $page_hook
      */
-    public function setPageHook(string $page_hook)
+    public function setPageHook(string $page_hook): void
     {
         add_action('load-' . $page_hook, [$this, 'loadPage']);
     }
@@ -96,7 +96,7 @@ public function setPageHook(string $page_hook)
     /**
      * Run on admin initialization (in `admin_init` hook).
      */
-    public function initPage()
+    public function initPage(): void
     {
         // By default do nothing.
     }
@@ -107,7 +107,7 @@ public function initPage()
      *
      * @action https://developer.wordpress.org/reference/hooks/load-page_hook/
      */
-    public function loadPage()
+    public function loadPage(): void
     {
         // By default do nothing.
     }
diff --git a/classes/BlueChip/Security/Core/Admin/CountablePage.php b/classes/BlueChip/Security/Core/Admin/CountablePage.php
index 9b50154..c7b5948 100644
--- a/classes/BlueChip/Security/Core/Admin/CountablePage.php
+++ b/classes/BlueChip/Security/Core/Admin/CountablePage.php
@@ -18,7 +18,7 @@ trait CountablePage
      *
      * @param \BlueChip\Security\Modules\Countable $counter
      */
-    protected function setCounter(\BlueChip\Security\Modules\Countable $counter)
+    protected function setCounter(\BlueChip\Security\Modules\Countable $counter): void
     {
         $this->counter = $counter;
     }
@@ -27,7 +27,7 @@ protected function setCounter(\BlueChip\Security\Modules\Countable $counter)
     /**
      * Reset count(er).
      */
-    protected function resetCount()
+    protected function resetCount(): void
     {
         $user = wp_get_current_user();
         // Update $user's last view time for this page.
diff --git a/classes/BlueChip/Security/Core/Admin/ListingPage.php b/classes/BlueChip/Security/Core/Admin/ListingPage.php
index a524eaa..ee9de5b 100644
--- a/classes/BlueChip/Security/Core/Admin/ListingPage.php
+++ b/classes/BlueChip/Security/Core/Admin/ListingPage.php
@@ -15,7 +15,7 @@ trait ListingPage
     private $per_page_option_name;
 
 
-    abstract protected function initListTable();
+    abstract protected function initListTable(): void;
 
 
     /**
@@ -23,7 +23,7 @@ abstract protected function initListTable();
      *
      * @param string $option_name
      */
-    private function setPerPageOption(string $option_name)
+    private function setPerPageOption(string $option_name): void
     {
         $this->per_page_option_name = $option_name;
 
@@ -36,7 +36,7 @@ private function setPerPageOption(string $option_name)
     /**
      * @link https://developer.wordpress.org/reference/functions/add_screen_option/
      */
-    private function addPerPageOption()
+    private function addPerPageOption(): void
     {
         add_screen_option('per_page', [
             'label' => __('Records', 'bc-security'),
diff --git a/classes/BlueChip/Security/Core/Admin/PageWithAssets.php b/classes/BlueChip/Security/Core/Admin/PageWithAssets.php
index 7a0b63c..9a1cac8 100644
--- a/classes/BlueChip/Security/Core/Admin/PageWithAssets.php
+++ b/classes/BlueChip/Security/Core/Admin/PageWithAssets.php
@@ -15,7 +15,7 @@ trait PageWithAssets
     /**
      * @param \BlueChip\Security\Core\AssetsManager $assets_manager
      */
-    protected function useAssetsManager(AssetsManager $assets_manager)
+    protected function useAssetsManager(AssetsManager $assets_manager): void
     {
         $this->assets_manager = $assets_manager;
     }
@@ -24,7 +24,7 @@ protected function useAssetsManager(AssetsManager $assets_manager)
     /**
      * @param array $assets JS assets to enqueue in [ handle => filename ] format.
      */
-    protected function enqueueJsAssets(array $assets)
+    protected function enqueueJsAssets(array $assets): void
     {
         add_action('admin_enqueue_scripts', function () use ($assets) {
             foreach ($assets as $handle => $filename) {
@@ -32,7 +32,7 @@ protected function enqueueJsAssets(array $assets)
                     $handle,
                     $this->assets_manager->getScriptFileUrl($filename),
                     ['jquery'],
-                    \filemtime($this->assets_manager->getScriptFilePath($filename)),
+                    (string) \filemtime($this->assets_manager->getScriptFilePath($filename)),
                     true
                 );
             }
@@ -43,7 +43,7 @@ protected function enqueueJsAssets(array $assets)
     /**
      * @param array $assets CSS assets to enqueue in [ handle => filename ] format.
      */
-    protected function enqueueCssAssets(array $assets)
+    protected function enqueueCssAssets(array $assets): void
     {
         add_action('admin_enqueue_scripts', function () use ($assets) {
             foreach ($assets as $handle => $filename) {
@@ -51,7 +51,7 @@ protected function enqueueCssAssets(array $assets)
                     $handle,
                     $this->assets_manager->getStyleFileUrl($filename),
                     [],
-                    \filemtime($this->assets_manager->getStyleFilePath($filename))
+                    (string) \filemtime($this->assets_manager->getStyleFilePath($filename))
                 );
             }
         }, 10, 0);
diff --git a/classes/BlueChip/Security/Core/Admin/SettingsPage.php b/classes/BlueChip/Security/Core/Admin/SettingsPage.php
index 2271c89..af0805f 100644
--- a/classes/BlueChip/Security/Core/Admin/SettingsPage.php
+++ b/classes/BlueChip/Security/Core/Admin/SettingsPage.php
@@ -38,7 +38,7 @@ trait SettingsPage
      *
      * @param \BlueChip\Security\Core\Settings $settings
      */
-    protected function useSettings(\BlueChip\Security\Core\Settings $settings)
+    protected function useSettings(\BlueChip\Security\Core\Settings $settings): void
     {
         // Remember the settings.
         $this->settings = $settings;
@@ -50,7 +50,7 @@ protected function useSettings(\BlueChip\Security\Core\Settings $settings)
     /**
      * Display settings errors via admin notices.
      */
-    public function displaySettingsErrors()
+    public function displaySettingsErrors(): void
     {
         add_action('admin_notices', 'settings_errors');
     }
@@ -59,7 +59,7 @@ public function displaySettingsErrors()
     /**
      * Register setting.
      */
-    public function registerSettings()
+    public function registerSettings(): void
     {
         register_setting($this->option_group, $this->option_name, [$this->settings, 'sanitize']);
     }
@@ -68,7 +68,7 @@ public function registerSettings()
     /**
      * Unregister setting.
      */
-    public function unregisterSettings()
+    public function unregisterSettings(): void
     {
         unregister_setting($this->option_group, $this->option_name);
     }
@@ -81,7 +81,7 @@ public function unregisterSettings()
      * of SETTINGS_* constants as $page.
      * @param string $page
      */
-    public function setSettingsPage(string $page)
+    public function setSettingsPage(string $page): void
     {
         $this->recent_page = $page;
     }
@@ -118,7 +118,7 @@ protected function getFieldBaseProperties(string $key, $value = null): array
      * @param string $title
      * @param callable|null $callback [optional]
      */
-    public function addSettingsSection(string $section, string $title, ?callable $callback = null)
+    public function addSettingsSection(string $section, string $title, ?callable $callback = null): void
     {
         if (!\is_string($this->recent_page)) {
             _doing_it_wrong(__METHOD__, 'No recent page set yet!', '0.1.0');
@@ -142,7 +142,7 @@ public function addSettingsSection(string $section, string $title, ?callable $ca
      * @param callable $callback Callback that produces form input for the field
      * @param array $args [Optional] Any extra arguments for $callback function
      */
-    public function addSettingsField(string $key, string $title, callable $callback, array $args = [])
+    public function addSettingsField(string $key, string $title, callable $callback, array $args = []): void
     {
         if (!\is_string($this->recent_page)) {
             _doing_it_wrong(__METHOD__, 'No recent page set yet!', '0.1.0');
@@ -170,7 +170,7 @@ public function addSettingsField(string $key, string $title, callable $callback,
     /**
      * Output nonce, action and other hidden fields.
      */
-    public function printSettingsFields()
+    public function printSettingsFields(): void
     {
         settings_fields($this->option_group);
     }
@@ -179,7 +179,7 @@ public function printSettingsFields()
     /**
      * Output visible form fields.
      */
-    public function printSettingsSections()
+    public function printSettingsSections(): void
     {
         if (!\is_string($this->recent_page)) {
             _doing_it_wrong(__METHOD__, 'No recent page set!', '0.1.0');
@@ -193,7 +193,7 @@ public function printSettingsSections()
     /**
      * Output form for settings manipulation.
      */
-    protected function printSettingsForm()
+    protected function printSettingsForm(): void
     {
         echo '<form method="post" action="' . admin_url('options.php') . '">';
 
diff --git a/classes/BlueChip/Security/Core/AssetsManager.php b/classes/BlueChip/Security/Core/AssetsManager.php
index d9a7a7a..422b77c 100644
--- a/classes/BlueChip/Security/Core/AssetsManager.php
+++ b/classes/BlueChip/Security/Core/AssetsManager.php
@@ -31,6 +31,7 @@ public function __construct(string $plugin_filename)
 
     /**
      * @param string $filename Asset filename (ie. asset.js).
+     *
      * @return string Absolute path to the asset.
      */
     public function getScriptFilePath(string $filename): string
@@ -41,6 +42,7 @@ public function getScriptFilePath(string $filename): string
 
     /**
      * @param string $filename Asset filename (ie. asset.js).
+     *
      * @return string URL of the asset.
      */
     public function getScriptFileUrl(string $filename): string
@@ -51,6 +53,7 @@ public function getScriptFileUrl(string $filename): string
 
     /**
      * @param string $filename Asset filename (ie. asset.css).
+     *
      * @return string Absolute path to the asset.
      */
     public function getStyleFilePath(string $filename): string
@@ -61,6 +64,7 @@ public function getStyleFilePath(string $filename): string
 
     /**
      * @param string $filename Asset filename (ie. asset.css).
+     *
      * @return string URL of the asset.
      */
     public function getStyleFileUrl(string $filename): string
diff --git a/classes/BlueChip/Security/Core/ListTable.php b/classes/BlueChip/Security/Core/ListTable.php
index 4def270..be6552a 100644
--- a/classes/BlueChip/Security/Core/ListTable.php
+++ b/classes/BlueChip/Security/Core/ListTable.php
@@ -80,7 +80,7 @@ public function __construct(string $url, string $per_page_option_name, array $ar
      * @param string $single The text to be used in notice if action affected single item.
      * @param string $plural The text to be used in notice if action affected multiple items.
      */
-    protected function displayNotice(string $action, string $single, string $plural)
+    protected function displayNotice(string $action, string $single, string $plural): void
     {
         // Have any items been affected by given action?
         $result = \filter_input(INPUT_GET, $action, FILTER_VALIDATE_INT);
@@ -104,6 +104,7 @@ protected function displayNotice(string $action, string $single, string $plural)
      * @param int $id
      * @param string $class
      * @param string $label
+     *
      * @return string
      */
     protected function renderRowAction(string $action, int $id, string $class, string $label): string
@@ -127,6 +128,7 @@ protected function renderRowAction(string $action, int $id, string $class, strin
      * Return content for "checkbox" column.
      *
      * @param array $item
+     *
      * @return string
      */
     public function column_cb($item) // phpcs:ignore
@@ -140,6 +142,7 @@ public function column_cb($item) // phpcs:ignore
      *
      * @param array $item
      * @param string $column_name
+     *
      * @return string
      */
     public function column_default($item, $column_name) // phpcs:ignore
@@ -152,16 +155,20 @@ public function column_default($item, $column_name) // phpcs:ignore
      * Display datetime database fields in local time.
      *
      * @param string $datetime Datetime string retrieved from database.
-     * @return string Date and time of $datetime formatted in local time.
+     *
+     * @return string Date and time of $datetime formatted in local time. Empty string if $datetime could not be parsed.
      */
     public function formatDateAndTime(string $datetime): string
     {
-        return wp_date(self::DATETIME_FORMAT, MySQLDateTime::parseTimestamp($datetime));
+        $timestamp = MySQLDateTime::parseTimestamp($datetime);
+        return ($timestamp !== null) ? (wp_date(self::DATETIME_FORMAT, $timestamp) ?: '') : '';
     }
 
 
     /**
      * Output "no items" message.
+     *
+     * @return void
      */
     public function no_items() // phpcs:ignore
     {
diff --git a/classes/BlueChip/Security/Core/Settings.php b/classes/BlueChip/Security/Core/Settings.php
index 54ad107..ad20153 100644
--- a/classes/BlueChip/Security/Core/Settings.php
+++ b/classes/BlueChip/Security/Core/Settings.php
@@ -9,7 +9,7 @@
  *
  * @link https://developer.wordpress.org/plugins/settings/settings-api/
  */
-abstract class Settings implements \ArrayAccess
+abstract class Settings implements \ArrayAccess, \IteratorAggregate
 {
     /**
      * @var array Default values for all settings. Descendant classes should override it.
@@ -48,6 +48,7 @@ public function __construct(string $option_name)
      * Get value of setting under key $name.
      *
      * @param string $name
+     *
      * @return mixed A null value is returned if $name is not a valid key.
      */
     public function __get(string $name)
@@ -67,7 +68,7 @@ public function __get(string $name)
      * @param string $name
      * @param mixed $value
      */
-    public function __set(string $name, $value)
+    public function __set(string $name, $value): void
     {
         if (isset($this->data[$name])) {
             $this->update($name, $value);
@@ -85,6 +86,7 @@ public function __set(string $name, $value)
      * @internal Implements ArrayAccess interface.
      *
      * @param string $offset
+     *
      * @return bool
      */
     public function offsetExists($offset): bool
@@ -99,6 +101,7 @@ public function offsetExists($offset): bool
      * @internal Implements ArrayAccess interface.
      *
      * @param string $offset
+     *
      * @return mixed A null value is returned if $offset is not a valid key.
      */
     public function offsetGet($offset)
@@ -115,7 +118,7 @@ public function offsetGet($offset)
      * @param string $offset
      * @param mixed $value
      */
-    public function offsetSet($offset, $value)
+    public function offsetSet($offset, $value): void
     {
         $this->update($offset, $value);
     }
@@ -128,12 +131,20 @@ public function offsetSet($offset, $value)
      *
      * @param string $offset
      */
-    public function offsetUnset($offset)
+    public function offsetUnset($offset): void
     {
         $this->update($offset, null);
     }
 
 
+    //// IteratorAggregate API /////////////////////////////////////////////////
+
+    public function getIterator(): \Traversable
+    {
+        return new \ArrayIterator($this->data);
+    }
+
+
     /**
      * Get option name.
      *
@@ -160,6 +171,7 @@ public function get(): array
      * Set $data as option data.
      *
      * @param array $data
+     *
      * @return bool
      */
     public function set(array $data): bool
@@ -215,6 +227,7 @@ public function persist(): bool
      *
      * @param array $settings Input data to sanitize.
      * @param array $defaults [optional] If provided, used as default values for sanitization instead of local data.
+     *
      * @return array
      */
     public function sanitize(array $settings, array $defaults = []): array
@@ -244,6 +257,7 @@ public function sanitize(array $settings, array $defaults = []): array
      *
      * @param mixed $value
      * @param mixed $default
+     *
      * @return mixed
      */
     protected static function sanitizeByType($value, $default)
@@ -265,8 +279,9 @@ protected static function sanitizeByType($value, $default)
     /**
      * Parse a list of items separated by EOL character into array. Trim any empty lines (items).
      *
-     * @param array|string $list
-     * @return array
+     * @param string|string[] $list
+     *
+     * @return string[]
      */
     protected static function parseList($list): array
     {
@@ -279,9 +294,10 @@ protected static function parseList($list): array
      *
      * @param string $name
      * @param mixed $value
+     *
      * @return bool
      */
-    protected function update(string $name, $value): bool
+    public function update(string $name, $value): bool
     {
         if (!isset($this->data[$name])) {
             // Cannot update, invalid setting name.
@@ -298,7 +314,7 @@ protected function update(string $name, $value): bool
             $data[$name] = $value;
         }
 
-        // Sanitize new value and update cache
+        // Sanitize new value and update cache.
         $this->data = $this->sanitize($data);
         // Make changes permanent.
         return $this->persist();
@@ -316,7 +332,7 @@ protected function update(string $name, $value): bool
      *
      * @param callable $callback Callback that accepts up to three parameters: $old_value, $value, $option_name.
      */
-    public function addUpdateHook(callable $callback)
+    public function addUpdateHook(callable $callback): void
     {
         add_action("update_option_{$this->option_name}", [$this, 'updateOption'], 10, 2);
         add_action("update_option_{$this->option_name}", $callback, 10, 3);
@@ -325,10 +341,11 @@ public function addUpdateHook(callable $callback)
 
     /**
      * @action https://developer.wordpress.org/reference/hooks/update_option_option/
+     *
      * @param array $old_value
      * @param array $new_value
      */
-    public function updateOption(array $old_value, array $new_value)
+    public function updateOption(array $old_value, array $new_value): void
     {
         $this->data = $new_value;
     }
diff --git a/classes/BlueChip/Security/Helpers/AdminNotices.php b/classes/BlueChip/Security/Helpers/AdminNotices.php
index 7c51aba..8d85c2f 100644
--- a/classes/BlueChip/Security/Helpers/AdminNotices.php
+++ b/classes/BlueChip/Security/Helpers/AdminNotices.php
@@ -17,20 +17,17 @@ abstract class AdminNotices
      *
      * @link https://make.wordpress.org/core/2015/04/23/spinners-and-dismissible-admin-notices-in-4-2/
      *
-     * @param array|string $message Single message or array of messages.
+     * @param string $message Message to display in admin notice.
      * @param string $type [optional] Type: 'notice-error', 'notice-warning', 'notice-success' or 'notice-info] (default).
      * @param bool $is_dismissible [optional] Should the notice be dismissible? Default is true.
      * @param bool $escape_html [optional] Should the content of message be HTML escaped? Default is true.
      */
-    public static function add($message, string $type = self::INFO, bool $is_dismissible = true, bool $escape_html = true)
+    public static function add(string $message, string $type = self::INFO, bool $is_dismissible = true, bool $escape_html = true): void
     {
         $classes = \implode(' ', \array_filter(['notice', $type, $is_dismissible ? 'is-dismissible' : '']));
         add_action('admin_notices', function () use ($message, $classes, $escape_html) {
             echo '<div class="' . $classes . '">';
-            $messages = \is_array($message) ? $message : [$message];
-            \array_walk($messages, function ($msg) use ($escape_html) {
-                echo '<p>' . ($escape_html ? esc_html($msg) : $msg) . '</p>';
-            });
+            echo '<p>' . ($escape_html ? esc_html($message) : $message) . '</p>';
             echo '</div>';
         });
     }
diff --git a/classes/BlueChip/Security/Helpers/AjaxHelper.php b/classes/BlueChip/Security/Helpers/AjaxHelper.php
index f871e09..3d09652 100644
--- a/classes/BlueChip/Security/Helpers/AjaxHelper.php
+++ b/classes/BlueChip/Security/Helpers/AjaxHelper.php
@@ -19,7 +19,7 @@ abstract class AjaxHelper
      * @param string $action
      * @param callable $handler
      */
-    public static function addHandler(string $action, callable $handler)
+    public static function addHandler(string $action, callable $handler): void
     {
         add_action(self::WP_AJAX_PREFIX . $action, function () use ($action, $handler) {
             // Check AJAX referer for given action - will die if invalid.
@@ -38,7 +38,7 @@ public static function addHandler(string $action, callable $handler)
      * @param string $action
      * @param array $data
      */
-    public static function injectSetup(string $handle, string $object_name, string $action, array $data = [])
+    public static function injectSetup(string $handle, string $object_name, string $action, array $data = []): void
     {
         add_action('admin_enqueue_scripts', function () use ($handle, $object_name, $action, $data) {
             // Default localization data for every AJAX request.
diff --git a/classes/BlueChip/Security/Helpers/FormHelper.php b/classes/BlueChip/Security/Helpers/FormHelper.php
index 205f9cb..c2fdedd 100644
--- a/classes/BlueChip/Security/Helpers/FormHelper.php
+++ b/classes/BlueChip/Security/Helpers/FormHelper.php
@@ -6,6 +6,7 @@ abstract class FormHelper
 {
     /**
      * @link https://developer.mozilla.org/en-US/docs/Web/HTML/Element/textarea
+     *
      * @var int Default value of "cols" attribute of <textarea> element.
      */
     private const TEXTAREA_COLS_DEFAULT_VALUE = 20;
@@ -35,7 +36,7 @@ abstract class FormHelper
      *
      * @param array $args Required: label_for, name, value. Optional: class, plain.
      */
-    public static function printCheckbox(array $args)
+    public static function printCheckbox(array $args): void
     {
         // Field properties
         $properties = [
@@ -66,7 +67,7 @@ public static function printCheckbox(array $args)
      *
      * @param array $args Required: label_for, name, value. Optional: class.
      */
-    public static function printHiddenInput(array $args)
+    public static function printHiddenInput(array $args): void
     {
         // Field properties
         $properties = [
@@ -86,7 +87,7 @@ public static function printHiddenInput(array $args)
      *
      * @param array $args Required: label_for, name, value. Optional: class.
      */
-    public static function printNumberInput(array $args)
+    public static function printNumberInput(array $args): void
     {
         // Field properties
         $properties = [
@@ -108,7 +109,7 @@ public static function printNumberInput(array $args)
      *
      * @param array $args Required: label_for, name, value. Optional: class.
      */
-    public static function printTextInput(array $args)
+    public static function printTextInput(array $args): void
     {
         // Field properties
         $properties = [
@@ -130,7 +131,7 @@ public static function printTextInput(array $args)
      *
      * @param array $args Required: label_for, name, value. Optional: class.
      */
-    public static function printSelect(array $args)
+    public static function printSelect(array $args): void
     {
         $properties = [
             'class'     => $args['class'] ?? '',
@@ -157,7 +158,7 @@ public static function printSelect(array $args)
      *
      * @param array $args Required: label_for, name, value. Optional: class, cols, rows.
      */
-    public static function printTextArea(array $args)
+    public static function printTextArea(array $args): void
     {
         // Field properties
         $properties = [
@@ -183,6 +184,7 @@ public static function printTextArea(array $args)
      * @see esc_attr()
      *
      * @param array $properties
+     *
      * @return string
      */
     protected static function renderFieldProperties(array $properties): string
@@ -200,9 +202,9 @@ function ($value) {
         );
         // Map keys and values together as key=value
         $mapped = \array_map(
-            function ($key, $value) {
+            function (string $key, $value) {
                 // Boolean values are replaced with key name: checked => true ---> checked="checked"
-                return \sprintf('%s="%s"', $key, esc_attr(\is_bool($value) ? $key : $value));
+                return \sprintf('%s="%s"', $key, esc_attr(\is_bool($value) ? $key : (string) $value));
             },
             \array_keys($filtered),
             \array_values($filtered)
@@ -219,7 +221,7 @@ function ($key, $value) {
      * @param array $args
      * @param bool $inline
      */
-    protected static function printAppendix(array $args, bool $inline)
+    protected static function printAppendix(array $args, bool $inline): void
     {
         if (isset($args['description'])) {
             echo \sprintf(
diff --git a/classes/BlueChip/Security/Helpers/HaveIBeenPwned.php b/classes/BlueChip/Security/Helpers/HaveIBeenPwned.php
index 8afb9b0..b06c8db 100644
--- a/classes/BlueChip/Security/Helpers/HaveIBeenPwned.php
+++ b/classes/BlueChip/Security/Helpers/HaveIBeenPwned.php
@@ -14,6 +14,7 @@ abstract class HaveIBeenPwned
 
     /**
      * @link https://haveibeenpwned.com/API/v2#SearchingPwnedPasswordsByRange
+     *
      * @var string URL of Pwned Passwords API range search end-point
      */
     public const PWNEDPASSWORDS_API_RANGE_SEARCH_URL = 'https://api.pwnedpasswords.com/range/';
@@ -21,7 +22,9 @@ abstract class HaveIBeenPwned
 
     /**
      * @link https://haveibeenpwned.com/API/v2#PwnedPasswords
+     *
      * @param string $password Password to check.
+     *
      * @return bool True if $password has been previously exposed in a data breach, false if not, null if check failed.
      */
     public static function hasPasswordBeenPwned(string $password): ?bool
diff --git a/classes/BlueChip/Security/Helpers/Is.php b/classes/BlueChip/Security/Helpers/Is.php
index 1d37428..7af5897 100644
--- a/classes/BlueChip/Security/Helpers/Is.php
+++ b/classes/BlueChip/Security/Helpers/Is.php
@@ -5,12 +5,13 @@
 /**
  * Various is::xxx() helpers.
  */
-class Is
+abstract class Is
 {
     /**
      * Return true if current user is an admin.
      *
      * @param \WP_User $user
+     *
      * @return bool
      */
     public static function admin(\WP_User $user): bool
@@ -49,6 +50,7 @@ public static function live(): bool
      * Return true if current request is of given $type.
      *
      * @param string $type One of: admin, ajax, cron, frontend or wp-cli.
+     *
      * @return bool True if current request is of given $type, false otherwise.
      */
     public static function request(string $type): bool
diff --git a/classes/BlueChip/Security/Helpers/MySQLDateTime.php b/classes/BlueChip/Security/Helpers/MySQLDateTime.php
index f82dccf..593cdf5 100644
--- a/classes/BlueChip/Security/Helpers/MySQLDateTime.php
+++ b/classes/BlueChip/Security/Helpers/MySQLDateTime.php
@@ -18,6 +18,7 @@ abstract class MySQLDateTime
      * @link https://www.php.net/manual/en/date.php
      *
      * @param int $timestamp
+     *
      * @return string
      */
     public static function formatDateTime(int $timestamp): string
@@ -29,10 +30,12 @@ public static function formatDateTime(int $timestamp): string
      * @link https://www.php.net/manual/en/datetime.createfromformat.php
      *
      * @param string $datetime
-     * @return int
+     *
+     * @return int|null Timestamp for given $datetime string or null if $datetime cannot be parsed.
      */
-    public static function parseTimestamp(string $datetime): int
+    public static function parseTimestamp(string $datetime): ?int
     {
-        return \date_create_from_format(self::FORMAT, $datetime)->getTimestamp();
+        $datetime_from_format = \date_create_from_format(self::FORMAT, $datetime);
+        return $datetime_from_format ? $datetime_from_format->getTimestamp() : null;
     }
 }
diff --git a/classes/BlueChip/Security/Helpers/Plugin.php b/classes/BlueChip/Security/Helpers/Plugin.php
index 93493cd..53cea9d 100644
--- a/classes/BlueChip/Security/Helpers/Plugin.php
+++ b/classes/BlueChip/Security/Helpers/Plugin.php
@@ -46,6 +46,7 @@ public static function getChangelogUrl(string $plugin_basename, array $plugin_da
 
     /**
      * @param string $plugin_basename
+     *
      * @return string Presumable URL of the plugin in WordPress.org Plugins Directory.
      */
     public static function getDirectoryUrl(string $plugin_basename): string
@@ -57,6 +58,7 @@ public static function getDirectoryUrl(string $plugin_basename): string
     /**
      * @param string $plugin_basename
      * @param array $plugin_data
+     *
      * @return string Presumable URL of the plugin checksums file at WordPress.org.
      */
     public static function getChecksumsUrl(string $plugin_basename, array $plugin_data): string
@@ -69,6 +71,7 @@ public static function getChecksumsUrl(string $plugin_basename, array $plugin_da
      * Get slug (ie. bc-security) for plugin with given basename (ie. bc-security/bc-security.php).
      *
      * @param string $plugin_basename
+     *
      * @return string Plugin slug or empty string if plugin does not seem to be installed in its own directory.
      */
     public static function getSlug(string $plugin_basename): string
@@ -83,6 +86,7 @@ public static function getSlug(string $plugin_basename): string
 
     /**
      * @param string $plugin_basename
+     *
      * @return bool True if there is readme.txt file present in plugin directory, false otherwise.
      */
     public static function hasReadmeTxt(string $plugin_basename): bool
@@ -96,6 +100,7 @@ public static function hasReadmeTxt(string $plugin_basename): bool
      *
      * @param string $plugin_basename
      * @param array $plugin_data
+     *
      * @return bool
      */
     public static function hasWordPressOrgUpdateUri(string $plugin_basename, array $plugin_data): bool
@@ -109,7 +114,7 @@ public static function hasWordPressOrgUpdateUri(string $plugin_basename, array $
         $plugin_update_uri = $plugin_data['UpdateURI'];
 
         if ($plugin_update_uri === '') {
-            // If no Update URI is present, WordPress 5.8 return empty string.
+            // Empty string = no Update URI header is present.
             return true;
         }
 
@@ -129,6 +134,7 @@ public static function hasWordPressOrgUpdateUri(string $plugin_basename, array $
 
     /**
      * @param string $plugin_basename
+     *
      * @return bool True if directory of given plugin seems to be under version control (Subversion or Git).
      */
     public static function isVersionControlled(string $plugin_basename): bool
@@ -172,7 +178,9 @@ function (array $plugin_data, string $plugin_basename): bool {
 
     /**
      * @internal Only use in admin (back-end) context.
+     *
      * @param string $plugin_basename
+     *
      * @return array
      */
     public static function getPluginData(string $plugin_basename): array
@@ -188,6 +196,7 @@ public static function getPluginData(string $plugin_basename): array
      * @see get_plugins()
      *
      * @param string $plugin_basename Basename of plugin installed in its own directory.
+     *
      * @return string Absolute path to directory where plugin is installed.
      */
     public static function getPluginDirPath(string $plugin_basename): string
@@ -206,7 +215,8 @@ public static function getPluginDirPath(string $plugin_basename): string
      * @param array $plugins List of plugin data items
      * @param string $link_to [optional] Wrap plugin name in a link to URL stored under given key.
      * @param string $extend_by [optional] Append text stored under given key to plugin name.
-     * @return array
+     *
+     * @return string[]
      */
     public static function populateList(array $plugins, string $link_to = '', string $extend_by = ''): array
     {
@@ -226,7 +236,7 @@ function (array $plugin_data) use ($link_to, $extend_by): string {
 
                 return $plugin_link . $plugin_info;
             },
-            $plugins
+            \array_values($plugins) // = convert associative keys to numeric indices
         );
     }
 }
diff --git a/classes/BlueChip/Security/Helpers/SafeBrowsingClient.php b/classes/BlueChip/Security/Helpers/SafeBrowsingClient.php
index bf7938b..b47ffe3 100644
--- a/classes/BlueChip/Security/Helpers/SafeBrowsingClient.php
+++ b/classes/BlueChip/Security/Helpers/SafeBrowsingClient.php
@@ -59,6 +59,7 @@ public function __construct(string $google_api_key)
      * Check a single URL for presence in Safe Browsing blacklist.
      *
      * @param string $url URL to check.
+     *
      * @return bool|null True if URL is on Safe Browsing blacklist, false if it is not, null on error.
      */
     public function check(string $url): ?bool
@@ -97,7 +98,8 @@ public function check(string $url): ?bool
 
 
     /**
-     * @param array $urls List of URLs to look up.
+     * @param string[] $urls List of URLs to look up.
+     *
      * @return array|null List of matches (empty means no matches found) or null on error.
      */
     public function lookup(array $urls): ?array
@@ -126,6 +128,7 @@ public function lookup(array $urls): ?array
      *
      * @param string $url
      * @param string $lang
+     *
      * @return string
      */
     public static function getReportUrl(string $url, string $lang = 'en'): string
@@ -138,6 +141,7 @@ public static function getReportUrl(string $url, string $lang = 'en'): string
      * @todo Maybe this wheel has already been invented?
      *
      * @param object $match
+     *
      * @return int|null Cache lifetime for $match in seconds or null if unknown.
      */
     private static function getCacheDuration(object $match): ?int
@@ -159,7 +163,8 @@ private static function getCacheDuration(object $match): ?int
     /**
      * @link https://developers.google.com/safe-browsing/v4/lookup-api#http-post-request
      *
-     * @param array $urls List of URLs to check
+     * @param string[] $urls List of URLs to check
+     *
      * @return array Safe Browsing request data
      */
     private static function getRequestBody(array $urls): array
diff --git a/classes/BlueChip/Security/Helpers/Transients.php b/classes/BlueChip/Security/Helpers/Transients.php
index 92fb210..21cb521 100644
--- a/classes/BlueChip/Security/Helpers/Transients.php
+++ b/classes/BlueChip/Security/Helpers/Transients.php
@@ -17,6 +17,7 @@ abstract class Transients
      * Delete transient.
      *
      * @param string ...$key
+     *
      * @return bool
      */
     public static function deleteFromSite(string ...$key): bool
@@ -32,7 +33,7 @@ public static function deleteFromSite(string ...$key): bool
      *
      * @param \wpdb $wpdb WordPress database access abstraction object
      */
-    public static function flush(\wpdb $wpdb)
+    public static function flush(\wpdb $wpdb): void
     {
         $table_name = is_multisite() ? $wpdb->sitemeta : $wpdb->options;
 
@@ -54,6 +55,7 @@ public static function flush(\wpdb $wpdb)
      * Get transient.
      *
      * @param string ...$key
+     *
      * @return mixed
      */
     public static function getForSite(string ...$key)
@@ -67,6 +69,7 @@ public static function getForSite(string ...$key)
      *
      * @param mixed $value
      * @param mixed ...$args
+     *
      * @return bool
      */
     public static function setForSite($value, ...$args): bool
@@ -82,6 +85,7 @@ public static function setForSite($value, ...$args): bool
      * Create transient name from $key.
      *
      * @param string[] $key
+     *
      * @return string
      */
     private static function name(array $key): string
diff --git a/classes/BlueChip/Security/Helpers/Utils.php b/classes/BlueChip/Security/Helpers/Utils.php
new file mode 100644
index 0000000..0737dc1
--- /dev/null
+++ b/classes/BlueChip/Security/Helpers/Utils.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace BlueChip\Security\Helpers;
+
+abstract class Utils
+{
+    /**
+     * Terminate script execution via wp_die(), pass 503 as return code.
+     *
+     * @link https://httpstatusdogs.com/503-service-unavailable
+     *
+     * @param string $ip_address Remote IP address to include in error message [optional].
+     */
+    public static function blockAccessTemporarily(string $ip_address = ''): void
+    {
+        $error_msg = empty($ip_address)
+            ? esc_html__('Access from your device has been temporarily disabled for security reasons.', 'bc-security')
+            : \sprintf(esc_html__('Access from your IP address %1$s has been temporarily disabled for security reasons.', 'bc-security'), \sprintf('<em>%s</em>', $ip_address))
+        ;
+        //
+        wp_die($error_msg, __('Service Temporarily Unavailable', 'bc-security'), 503);
+    }
+}
diff --git a/classes/BlueChip/Security/Helpers/WpRemote.php b/classes/BlueChip/Security/Helpers/WpRemote.php
index e3695a3..0cf5a2a 100644
--- a/classes/BlueChip/Security/Helpers/WpRemote.php
+++ b/classes/BlueChip/Security/Helpers/WpRemote.php
@@ -11,6 +11,7 @@ abstract class WpRemote
      * Fetch JSON data from remote $url.
      *
      * @param string $url
+     *
      * @return mixed
      */
     public static function getJson(string $url)
@@ -36,6 +37,7 @@ public static function getJson(string $url)
      *
      * @param string $url
      * @param mixed $body
+     *
      * @return mixed
      */
     public static function postJson(string $url, $body)
diff --git a/classes/BlueChip/Security/Modules/Activable.php b/classes/BlueChip/Security/Modules/Activable.php
index addb848..6ebfca3 100644
--- a/classes/BlueChip/Security/Modules/Activable.php
+++ b/classes/BlueChip/Security/Modules/Activable.php
@@ -7,10 +7,10 @@ interface Activable
     /**
      * Activate module (add cron jobs etc.)
      */
-    public function activate();
+    public function activate(): void;
 
     /**
      * Deactivate module (remove cron jobs etc.)
      */
-    public function deactivate();
+    public function deactivate(): void;
 }
diff --git a/classes/BlueChip/Security/Modules/Checklist/AdminPage.php b/classes/BlueChip/Security/Modules/Checklist/AdminPage.php
index 709338b..a2dec4d 100644
--- a/classes/BlueChip/Security/Modules/Checklist/AdminPage.php
+++ b/classes/BlueChip/Security/Modules/Checklist/AdminPage.php
@@ -2,6 +2,7 @@
 
 namespace BlueChip\Security\Modules\Checklist;
 
+use BlueChip\Security\Core\AssetsManager;
 use BlueChip\Security\Helpers\AjaxHelper;
 use BlueChip\Security\Helpers\FormHelper;
 use BlueChip\Security\Modules\Hardening;
@@ -32,7 +33,7 @@ class AdminPage extends \BlueChip\Security\Core\Admin\AbstractPage
      * @param \BlueChip\Security\Modules\Checklist\AutorunSettings $settings
      * @param \BlueChip\Security\Core\AssetsManager $assets_manager
      */
-    public function __construct(Manager $checklist_manager, AutorunSettings $settings, \BlueChip\Security\Core\AssetsManager $assets_manager)
+    public function __construct(Manager $checklist_manager, AutorunSettings $settings, AssetsManager $assets_manager)
     {
         $this->page_title = _x('Security Checklist', 'Dashboard page title', 'bc-security');
         $this->menu_title = _x('Checklist', 'Dashboard menu item name', 'bc-security');
@@ -47,7 +48,7 @@ public function __construct(Manager $checklist_manager, AutorunSettings $setting
     /**
      * Initialize settings page: register settings etc.
      */
-    public function initPage()
+    public function initPage(): void
     {
         // Register settings.
         $this->registerSettings();
@@ -57,7 +58,7 @@ public function initPage()
     }
 
 
-    public function loadPage()
+    public function loadPage(): void
     {
         $this->enqueueCssAssets(['checklist' => 'checklist.css',]);
         $this->enqueueJsAssets(['checklist' => 'checklist.js',]);
@@ -89,7 +90,7 @@ public function getCount(): int
     /**
      * Output admin page.
      */
-    public function printContents()
+    public function printContents(): void
     {
         echo '<div class="wrap">';
 
@@ -140,7 +141,7 @@ public function printContents()
     /**
      * @param array $basic_checks
      */
-    private function printBasicChecksSection(array $basic_checks)
+    private function printBasicChecksSection(array $basic_checks): void
     {
         echo '<h2>' . esc_html__('Basic checks', 'bc-security') . '</h2>';
 
@@ -159,7 +160,7 @@ private function printBasicChecksSection(array $basic_checks)
     /**
      * @param array $advanced_checks
      */
-    private function printAdvancedChecksSection(array $advanced_checks)
+    private function printAdvancedChecksSection(array $advanced_checks): void
     {
         echo '<h2>' . esc_html__('Advanced checks', 'bc-security') . '</h2>';
 
@@ -175,7 +176,7 @@ private function printAdvancedChecksSection(array $advanced_checks)
     }
 
 
-    private function printChecklistMonitoringSection()
+    private function printChecklistMonitoringSection(): void
     {
         echo '<h2>' . esc_html__('Checklist monitoring', 'bc-security') . '</h2>';
 
@@ -191,7 +192,7 @@ private function printChecklistMonitoringSection()
     }
 
 
-    private function printChecklistTable(array $checks, string $checks_class)
+    private function printChecklistTable(array $checks, string $checks_class): void
     {
         echo '<table class="wp-list-table widefat striped">';
 
@@ -218,7 +219,7 @@ private function printChecklistTable(array $checks, string $checks_class)
     /**
      * Output single table row with data labels.
      */
-    private function printLabelsRow()
+    private function printLabelsRow(): void
     {
         echo '<tr>';
         echo '<th>' . esc_html__('Monitor', 'bc-security') . '</th>';
@@ -237,7 +238,7 @@ private function printLabelsRow()
      *
      * @param \BlueChip\Security\Modules\Checklist\Check $check
      */
-    private function printCheckRow(Check $check, string $check_class)
+    private function printCheckRow(Check $check, string $check_class): void
     {
         $check_id = $check::getId();
         $check_html_id = array_reverse(explode("\\", $check_id))[0];
diff --git a/classes/BlueChip/Security/Modules/Checklist/AdvancedCheck.php b/classes/BlueChip/Security/Modules/Checklist/AdvancedCheck.php
index 56fdf36..bc3eda1 100644
--- a/classes/BlueChip/Security/Modules/Checklist/AdvancedCheck.php
+++ b/classes/BlueChip/Security/Modules/Checklist/AdvancedCheck.php
@@ -31,7 +31,7 @@ public function getCronJobHook(): string
      *
      * @hook \BlueChip\Security\Modules\Checklist\Hooks::ADVANCED_CHECK_ALERT
      */
-    public function runInCron()
+    public function runInCron(): void
     {
         $result = $this->run();
 
diff --git a/classes/BlueChip/Security/Modules/Checklist/CheckResult.php b/classes/BlueChip/Security/Modules/Checklist/CheckResult.php
index 0c0a232..bf715d1 100644
--- a/classes/BlueChip/Security/Modules/Checklist/CheckResult.php
+++ b/classes/BlueChip/Security/Modules/Checklist/CheckResult.php
@@ -10,14 +10,14 @@ class CheckResult
     private $status;
 
     /**
-     * @var array Human readable message explaining the result as list of (hyper)text lines.
+     * @var string[] Human readable message explaining the result as list of (hyper)text lines.
      */
     private $message;
 
 
     /**
      * @param bool|null $status Check result status: false if check failed; true if check passed; null for undetermined status.
-     * @param array|string $message Human readable message explaining the result - inline HTML tags are allowed/expected.
+     * @param string|string[] $message Human readable message explaining the result - inline HTML tags are allowed/expected.
      */
     public function __construct(?bool $status, $message)
     {
@@ -27,7 +27,7 @@ public function __construct(?bool $status, $message)
 
 
     /**
-     * @return array Human readable message as list of (hyper)text lines.
+     * @return string[] Human readable message as list of (hyper)text lines.
      */
     public function getMessage(): array
     {
diff --git a/classes/BlueChip/Security/Modules/Checklist/Checks/CoreIntegrity.php b/classes/BlueChip/Security/Modules/Checklist/Checks/CoreIntegrity.php
index 6b5fbf9..5c78a75 100644
--- a/classes/BlueChip/Security/Modules/Checklist/Checks/CoreIntegrity.php
+++ b/classes/BlueChip/Security/Modules/Checklist/Checks/CoreIntegrity.php
@@ -87,6 +87,7 @@ public static function getChecksumsUrl(): string
      * Get md5 checksums of core WordPress files from WordPress.org API.
      *
      * @param string $url
+     *
      * @return object|null
      */
     private static function getChecksums(string $url): ?object
@@ -112,6 +113,7 @@ private static function getChecksums(string $url): ?object
      * @hook \BlueChip\Security\Modules\Checklist\Hooks::IGNORED_CORE_MODIFIED_FILES
      *
      * @param object $checksums
+     *
      * @return array
      */
     private static function findModifiedFiles(object $checksums): array
@@ -145,6 +147,7 @@ function ($filename) {
      * @hook \BlueChip\Security\Modules\Checklist\Hooks::IGNORED_CORE_UNKNOWN_FILES
      *
      * @param object $checksums
+     *
      * @return array
      */
     private static function findUnknownFiles(object $checksums): array
diff --git a/classes/BlueChip/Security/Modules/Checklist/Checks/DirectoryListingDisabled.php b/classes/BlueChip/Security/Modules/Checklist/Checks/DirectoryListingDisabled.php
index 319f68a..bdce16d 100644
--- a/classes/BlueChip/Security/Modules/Checklist/Checks/DirectoryListingDisabled.php
+++ b/classes/BlueChip/Security/Modules/Checklist/Checks/DirectoryListingDisabled.php
@@ -22,7 +22,7 @@ public function __construct()
     protected function runInternal(): Checklist\CheckResult
     {
         $upload_paths = wp_upload_dir();
-        if (!isset($upload_paths['baseurl'])) {
+        if ($upload_paths['error'] !== false) {
             return new Checklist\CheckResult(null, esc_html__('BC Security has failed to determine whether directory listing is disabled.', 'bc-security'));
         }
 
diff --git a/classes/BlueChip/Security/Modules/Checklist/Checks/DisplayOfPhpErrorsIsOff.php b/classes/BlueChip/Security/Modules/Checklist/Checks/DisplayOfPhpErrorsIsOff.php
index 6d42ec0..b0edbc9 100644
--- a/classes/BlueChip/Security/Modules/Checklist/Checks/DisplayOfPhpErrorsIsOff.php
+++ b/classes/BlueChip/Security/Modules/Checklist/Checks/DisplayOfPhpErrorsIsOff.php
@@ -35,7 +35,7 @@ public function isMeaningful(): bool
     protected function runInternal(): Checklist\CheckResult
     {
         // Craft temporary file name.
-        $name = \sprintf('bc-security-checklist-test-error-display-%s.php', \md5(\rand()));
+        $name = \sprintf('bc-security-checklist-test-error-display-%s.php', \md5((string) \rand()));
 
         // The file is going to be created in wp-content directory.
         $path = WP_CONTENT_DIR . '/' . $name;
diff --git a/classes/BlueChip/Security/Modules/Checklist/Checks/ErrorLogNotPubliclyAccessible.php b/classes/BlueChip/Security/Modules/Checklist/Checks/ErrorLogNotPubliclyAccessible.php
index 5801727..ee46821 100644
--- a/classes/BlueChip/Security/Modules/Checklist/Checks/ErrorLogNotPubliclyAccessible.php
+++ b/classes/BlueChip/Security/Modules/Checklist/Checks/ErrorLogNotPubliclyAccessible.php
@@ -11,9 +11,9 @@ public function __construct()
         parent::__construct(
             __('Error log not publicly accessible', 'bc-security'),
             \sprintf(
-                /* translators: 1: link to Codex page on debugging, 2: WP_DEBUG constant, 3: WP_DEBUG_LOG constant, 4: debug.log file, 5: /wp-content path */
+                /* translators: 1: link to article on debugging, 2: WP_DEBUG constant, 3: WP_DEBUG_LOG constant, 4: debug.log file, 5: /wp-content path */
                 esc_html__('Both %2$s and %3$s constants are set to true, therefore %1$s to a %4$s log file inside the %5$s directory. This file can contain sensitive information and therefore should not be publicly accessible.', 'bc-security'),
-                '<a href="' . esc_url(__('https://codex.wordpress.org/Debugging_in_WordPress', 'bc-security')) . '" rel="noreferrer">' . esc_html__('WordPress saves all errors', 'bc-security') . '</a>',
+                '<a href="' . esc_url(__('https://wordpress.org/support/article/debugging-in-wordpress/', 'bc-security')) . '" rel="noreferrer">' . esc_html__('WordPress saves all errors', 'bc-security') . '</a>',
                 '<code>WP_DEBUG</code>',
                 '<code>WP_DEBUG_LOG</code>',
                 '<code>debug.log</code>',
diff --git a/classes/BlueChip/Security/Modules/Checklist/Checks/NoAccessToPhpFilesInUploadsDirectory.php b/classes/BlueChip/Security/Modules/Checklist/Checks/NoAccessToPhpFilesInUploadsDirectory.php
index 4d7546f..b8e2d8a 100644
--- a/classes/BlueChip/Security/Modules/Checklist/Checks/NoAccessToPhpFilesInUploadsDirectory.php
+++ b/classes/BlueChip/Security/Modules/Checklist/Checks/NoAccessToPhpFilesInUploadsDirectory.php
@@ -24,7 +24,7 @@ protected function runInternal(): Checklist\CheckResult
         $php_file_message = 'It is more secure to not allow PHP files to be accessed from within WordPress uploads directory.';
 
         // Prepare temporary file name and contents.
-        $name = \sprintf('bc-security-checklist-test-%s.txt', \md5(\rand())); // .txt extension to avoid upload file MIME check killing our test
+        $name = \sprintf('bc-security-checklist-test-%s.txt', \md5((string) \rand())); // .txt extension to avoid upload file MIME check killing our test
         $bits = \sprintf('<?php echo "%s";', $php_file_message);
 
         // Create temporary PHP file in uploads directory.
diff --git a/classes/BlueChip/Security/Modules/Checklist/Checks/NoMd5HashedPasswords.php b/classes/BlueChip/Security/Modules/Checklist/Checks/NoMd5HashedPasswords.php
index d3bae18..ed0b3cb 100644
--- a/classes/BlueChip/Security/Modules/Checklist/Checks/NoMd5HashedPasswords.php
+++ b/classes/BlueChip/Security/Modules/Checklist/Checks/NoMd5HashedPasswords.php
@@ -39,17 +39,18 @@ public function __construct(\wpdb $wpdb)
     protected function runInternal(): Checklist\CheckResult
     {
         // Get all users with old hash prefix
-        $result = $this->wpdb->get_results(\sprintf(
-            "SELECT `user_login` FROM {$this->wpdb->users} WHERE `user_pass` LIKE '%s%%';",
-            self::WP_OLD_HASH_PREFIX
-        ));
+        /** @var array|null $result */
+        $result = $this->wpdb->get_results(
+            \sprintf("SELECT `user_login` FROM {$this->wpdb->users} WHERE `user_pass` LIKE '%s%%';", self::WP_OLD_HASH_PREFIX),
+            ARRAY_A
+        );
 
         if ($result === null) {
             return new Checklist\CheckResult(null, esc_html__('BC Security has failed to determine whether there are any users with password hashed with default MD5-based algorithm.', 'bc-security'));
         } else {
-            return empty($result)
+            return ($result === [])
                 ? new Checklist\CheckResult(true, esc_html__('No users have password hashed with default MD5-based algorithm.', 'bc-security'))
-                : new Checklist\CheckResult(false, esc_html__('The following users have their password hashed with default MD5-based algorithm:', 'bc-security') . ' <em>' . \implode(', ', wp_list_pluck($result, 'user_login')) . '</em>')
+                : new Checklist\CheckResult(false, esc_html__('The following users have their password hashed with default MD5-based algorithm:', 'bc-security') . ' <em>' . \implode(', ', \array_column($result, 'user_login')) . '</em>')
             ;
         }
     }
diff --git a/classes/BlueChip/Security/Modules/Checklist/Checks/NoObviousUsernamesCheck.php b/classes/BlueChip/Security/Modules/Checklist/Checks/NoObviousUsernamesCheck.php
index 11ea098..666a6fc 100644
--- a/classes/BlueChip/Security/Modules/Checklist/Checks/NoObviousUsernamesCheck.php
+++ b/classes/BlueChip/Security/Modules/Checklist/Checks/NoObviousUsernamesCheck.php
@@ -11,9 +11,9 @@ public function __construct()
         parent::__construct(
             __('No obvious usernames exist', 'bc-security'),
             \sprintf(
-                /* translators: 1: link to Codex page on WordPress hardening */
+                /* translators: 1: link to article on WordPress hardening */
                 esc_html__('Usernames like "admin" and "administrator" are often used in brute force attacks and %1$s.', 'bc-security'),
-                '<a href="' . esc_url(__('https://codex.wordpress.org/Hardening_WordPress#Security_through_obscurity', 'bc-security')) . '" rel="noreferrer">' . esc_html__('should be avoided', 'bc-security') . '</a>'
+                '<a href="' . esc_url(__('https://wordpress.org/support/article/hardening-wordpress/#security-through-obscurity', 'bc-security')) . '" rel="noreferrer">' . esc_html__('should be avoided', 'bc-security') . '</a>'
             )
         );
     }
diff --git a/classes/BlueChip/Security/Modules/Checklist/Checks/NoPluginsRemovedFromDirectory.php b/classes/BlueChip/Security/Modules/Checklist/Checks/NoPluginsRemovedFromDirectory.php
index 2e13c22..dbf35db 100644
--- a/classes/BlueChip/Security/Modules/Checklist/Checks/NoPluginsRemovedFromDirectory.php
+++ b/classes/BlueChip/Security/Modules/Checklist/Checks/NoPluginsRemovedFromDirectory.php
@@ -98,6 +98,7 @@ protected function runInternal(): Checklist\CheckResult
 
     /**
      * @param array $plugins
+     *
      * @return array
      */
     private function getProblematicPlugins(array $plugins): array
@@ -144,6 +145,7 @@ private function getProblematicPlugins(array $plugins): array
      * Attempt to extract plugin notice from $body HTML.
      *
      * @param string $body
+     *
      * @return string Plugin notice as plain text or empty string on failure.
      */
     private function extractPluginNotice(string $body): string
diff --git a/classes/BlueChip/Security/Modules/Checklist/Checks/PhpFilesEditationDisabled.php b/classes/BlueChip/Security/Modules/Checklist/Checks/PhpFilesEditationDisabled.php
index 7ea5d09..7adec28 100644
--- a/classes/BlueChip/Security/Modules/Checklist/Checks/PhpFilesEditationDisabled.php
+++ b/classes/BlueChip/Security/Modules/Checklist/Checks/PhpFilesEditationDisabled.php
@@ -11,9 +11,9 @@ public function __construct()
         parent::__construct(
             __('PHP files editation disabled', 'bc-security'),
             \sprintf(
-                /* translators: 1: link to Codex page on WordPress hardening */
+                /* translators: 1: link to article on WordPress hardening */
                 esc_html__('It is generally recommended to %1$s.', 'bc-security'),
-                '<a href="' . esc_url(__('https://codex.wordpress.org/Hardening_WordPress#Disable_File_Editing', 'bc-security')) . '" rel="noreferrer">' . esc_html__('disable editation of PHP files', 'bc-security') . '</a>'
+                '<a href="' . esc_url(__('https://wordpress.org/support/article/hardening-wordpress/#disable-file-editing', 'bc-security')) . '" rel="noreferrer">' . esc_html__('disable editation of PHP files', 'bc-security') . '</a>'
             )
         );
     }
diff --git a/classes/BlueChip/Security/Modules/Checklist/Checks/PluginsIntegrity.php b/classes/BlueChip/Security/Modules/Checklist/Checks/PluginsIntegrity.php
index f0a968e..cb46475 100644
--- a/classes/BlueChip/Security/Modules/Checklist/Checks/PluginsIntegrity.php
+++ b/classes/BlueChip/Security/Modules/Checklist/Checks/PluginsIntegrity.php
@@ -54,7 +54,7 @@ protected function runInternal(): Checklist\CheckResult
             $plugin_data['ChecksumsURL'] = $checksums_url;
 
             // Get checksums.
-            if (empty($checksums = $this->getChecksums($checksums_url))) {
+            if (($checksums = $this->getChecksums($checksums_url)) === null) {
                 $checksums_retrieval_failed[$plugin_basename] = $plugin_data;
                 continue;
             }
@@ -68,7 +68,7 @@ protected function runInternal(): Checklist\CheckResult
             $unknown_files = Checklist\Helper::scanDirectoryForUnknownFiles($plugin_dir, $plugin_dir, $checksums, true);
 
             // Trigger alert if any suspicious files have been found.
-            if (!empty($modified_files) || !empty($unknown_files)) {
+            if (($modified_files !== []) || ($unknown_files !== [])) {
                 $checksums_verification_failed[$plugin_basename] = \array_merge(
                     $plugin_data,
                     [
@@ -80,7 +80,7 @@ protected function runInternal(): Checklist\CheckResult
         }
 
         // Format check results into human-readable output.
-        if (!empty($checksums_verification_failed)) {
+        if ($checksums_verification_failed !== []) {
             $message_parts = [
                 esc_html__('The following plugins seem to have been altered in some way.', 'bc-security'),
             ];
@@ -88,15 +88,15 @@ protected function runInternal(): Checklist\CheckResult
             foreach ($checksums_verification_failed as $plugin_basename => $plugin_data) {
                 $message_parts[] = '';
                 $message_parts[] = \sprintf('<strong>%s</strong> <code>%s</code>', esc_html($plugin_data['Name']), $plugin_basename);
-                if (!empty($plugin_data['ModifiedFiles'])) {
+                if ($plugin_data['ModifiedFiles'] !== '') {
                     $message_parts[] = \sprintf(esc_html__('Modified files: %s', 'bc-security'), $plugin_data['ModifiedFiles']);
                 }
-                if (!empty($plugin_data['UnknownFiles'])) {
+                if ($plugin_data['UnknownFiles'] !== '') {
                     $message_parts[] = \sprintf(esc_html__('Unknown files: %s', 'bc-security'), $plugin_data['UnknownFiles']);
                 }
             }
 
-            if (!empty($checksums_retrieval_failed)) {
+            if ($checksums_retrieval_failed !== []) {
                 // Also report any plugins that could not be checked, just in case.
                 $message_parts[] = '';
                 $message_parts[] = \sprintf(
@@ -107,7 +107,7 @@ protected function runInternal(): Checklist\CheckResult
             return new Checklist\CheckResult(false, $message_parts);
         }
 
-        if (!empty($checksums_retrieval_failed)) {
+        if ($checksums_retrieval_failed !== []) {
             $message = \sprintf(
                 esc_html__('No modified plugins found, but checksums for the following plugins could not be fetched: %s', 'bc-security'),
                 \implode(', ', Helpers\Plugin::populateList($checksums_retrieval_failed, 'ChecksumsURL'))
@@ -123,6 +123,7 @@ protected function runInternal(): Checklist\CheckResult
      * Get md5 checksums of plugin files from downloads.wordpress.org.
      *
      * @param string $url
+     *
      * @return object|null
      */
     private static function getChecksums(string $url): ?object
diff --git a/classes/BlueChip/Security/Modules/Checklist/Helper.php b/classes/BlueChip/Security/Modules/Checklist/Helper.php
index 383f733..83cfad5 100644
--- a/classes/BlueChip/Security/Modules/Checklist/Helper.php
+++ b/classes/BlueChip/Security/Modules/Checklist/Helper.php
@@ -6,6 +6,7 @@ abstract class Helper
 {
     /**
      * @param \BlueChip\Security\Modules\Checklist\Check $check
+     *
      * @return string
      */
     public static function formatLastRunTimestamp(Check $check): string
@@ -14,13 +15,14 @@ public static function formatLastRunTimestamp(Check $check): string
             return '--';
         } else {
             $format = \sprintf('%s %s', get_option('date_format'), get_option('time_format'));
-            return wp_date($format, $timestamp);
+            return wp_date($format, $timestamp) ?: '';
         }
     }
 
 
     /**
-     * @param array $list
+     * @param string[] $list
+     *
      * @return string
      */
     public static function formatListOfFiles(array $list): string
@@ -46,6 +48,7 @@ function (string $file): string {
      *
      * @param string $url URL to check.
      * @param string|null $body Response body to check [optional].
+     *
      * @return bool|null
      */
     public static function isAccessToUrlForbidden(string $url, ?string $body = null): ?bool
@@ -76,7 +79,8 @@ public static function isAccessToUrlForbidden(string $url, ?string $body = null)
      * @param string $path Absolute path to checksums root directory, must end with slash!
      * @param object $checksums Dictionary with { filename: checksum } items. All filenames must be relative to $path.
      * @param array $ignored_files List of filenames to ignore [optional].
-     * @return array
+     *
+     * @return string[]
      */
     public static function checkDirectoryForModifiedFiles(string $path, object $checksums, array $ignored_files = []): array
     {
@@ -117,7 +121,8 @@ public static function checkDirectoryForModifiedFiles(string $path, object $chec
      * @param string $path Absolute path to checksums root directory, must end with slash!
      * @param object $checksums Dictionary with { filename: checksum } items. All filenames must be relative to $path.
      * @param bool $recursive Scan subdirectories too [optional].
-     * @return array
+     *
+     * @return string[]
      */
     public static function scanDirectoryForUnknownFiles(string $directory, string $path, object $checksums, bool $recursive = false): array
     {
diff --git a/classes/BlueChip/Security/Modules/Checklist/Manager.php b/classes/BlueChip/Security/Modules/Checklist/Manager.php
index 080f5c3..b08512b 100644
--- a/classes/BlueChip/Security/Modules/Checklist/Manager.php
+++ b/classes/BlueChip/Security/Modules/Checklist/Manager.php
@@ -43,7 +43,7 @@ public function __construct(AutorunSettings $settings, Cron\Manager $cron_manage
     }
 
 
-    public function init()
+    public function init(): void
     {
         // When settings are updated, ensure that cron jobs for advanced checks are properly (de)activated.
         $this->settings->addUpdateHook([$this, 'updateCronJobs']);
@@ -62,6 +62,8 @@ public function init()
      *
      * @param \wpdb $wpdb WordPress database access abstraction object
      * @param string $google_api_key Google API key for project with Safe Browsing API enabled.
+     *
+     * @return array
      */
     public function constructChecks(\wpdb $wpdb, string $google_api_key): array
     {
@@ -105,24 +107,29 @@ public function constructChecks(\wpdb $wpdb, string $google_api_key): array
     }
 
 
+    /**
+     * @param string $id
+     *
+     * @return \BlueChip\Security\Modules\Checklist\Check|null
+     */
+    public function getCheck(string $id): ?Check
+    {
+        return $this->checks[$id] ?? null;
+    }
+
+
     /**
      * Return list of all implemented checks, optionally filtered.
      *
-     * @param array $filters [optional] Extra conditions to filter the list by: class (string), meaningful (boolean),
+     * @param array $filters [optional] Extra conditions to filter the list by: meaningful (boolean),
      *   monitored (boolean), status (null|boolean).
+     *
      * @return \BlueChip\Security\Modules\Checklist\Check[]
      */
     public function getChecks(array $filters = []): array
     {
         $checks = $this->checks;
 
-        if (isset($filters['class'])) {
-            $class = $filters['class'];
-            $checks = \array_filter($checks, function (Check $check) use ($class): bool {
-                return $check instanceof $class;
-            });
-        }
-
         if (isset($filters['meaningful'])) {
             $is_meaningful = $filters['meaningful'];
             $checks = \array_filter($checks, function (Check $check) use ($is_meaningful): bool {
@@ -151,29 +158,37 @@ public function getChecks(array $filters = []): array
 
     /**
      * @param bool $only_meaningful If true (default), return only meaningful checks, otherwise return all checks.
+     *
      * @return \BlueChip\Security\Modules\Checklist\AdvancedCheck[]
      */
     public function getAdvancedChecks(bool $only_meaningful = true): array
     {
-        $filters = ['class' => AdvancedCheck::class];
+        $filters = [];
         if ($only_meaningful) {
             $filters['meaningful'] = true;
         }
-        return $this->getChecks($filters);
+
+        return \array_filter($this->getChecks($filters), function (Check $check): bool {
+            return $check instanceof AdvancedCheck;
+        });
     }
 
 
     /**
      * @param bool $only_meaningful If true (default), return only meaningful checks, otherwise return all checks.
+     *
      * @return \BlueChip\Security\Modules\Checklist\BasicCheck[]
      */
     public function getBasicChecks(bool $only_meaningful = true): array
     {
-        $filters = ['class' => BasicCheck::class];
+        $filters = [];
         if ($only_meaningful) {
             $filters['meaningful'] = true;
         }
-        return $this->getChecks($filters);
+
+        return \array_filter($this->getChecks($filters), function (Check $check): bool {
+            return $check instanceof BasicCheck;
+        });
     }
 
 
@@ -182,7 +197,7 @@ public function getBasicChecks(bool $only_meaningful = true): array
      *
      * @internal Method is intended to be run from within cron request.
      */
-    public function runBasicChecks()
+    public function runBasicChecks(): void
     {
         $checks = $this->getBasicChecks();
         $issues = [];
@@ -204,7 +219,7 @@ public function runBasicChecks()
             }
         }
 
-        if (!empty($issues)) {
+        if ($issues !== []) {
             // Trigger an action to report found issues.
             do_action(Hooks::BASIC_CHECKS_ALERT, $issues);
         }
@@ -216,7 +231,7 @@ public function runBasicChecks()
      *
      * @internal Method is intended to be run from within AJAX requests.
      */
-    public function runCheck()
+    public function runCheck(): void
     {
         if (empty($check_id = \filter_input(INPUT_POST, 'check_id', FILTER_SANITIZE_STRING))) {
             wp_send_json_error([
@@ -224,8 +239,7 @@ public function runCheck()
             ]);
         }
 
-        $checks = $this->getChecks();
-        if (empty($check = $checks[$check_id])) {
+        if (($check = $this->getCheck($check_id)) === null) {
             wp_send_json_error([
                 'message' => \sprintf(__('Unknown check ID: %s', 'bc-security'), $check_id),
             ]);
@@ -245,7 +259,7 @@ public function runCheck()
     /**
      * Activate or deactivate cron jobs for advanced checks according to settings.
      */
-    public function updateCronJobs()
+    public function updateCronJobs(): void
     {
         foreach ($this->getAdvancedChecks(false) as $check_id => $advanced_check) {
             if ($this->settings[$check_id]) {
diff --git a/classes/BlueChip/Security/Modules/Countable.php b/classes/BlueChip/Security/Modules/Countable.php
index 555e0de..08eedb2 100644
--- a/classes/BlueChip/Security/Modules/Countable.php
+++ b/classes/BlueChip/Security/Modules/Countable.php
@@ -15,6 +15,7 @@ public function countAll(): int;
      * Return number of all items newer than given $timestamp.
      *
      * @param int $timestamp
+     *
      * @return int Number of all items newer than given $timestamp.
      */
     public function countFrom(int $timestamp): int;
diff --git a/classes/BlueChip/Security/Modules/Cron/Job.php b/classes/BlueChip/Security/Modules/Cron/Job.php
index 7167adc..d82d481 100644
--- a/classes/BlueChip/Security/Modules/Cron/Job.php
+++ b/classes/BlueChip/Security/Modules/Cron/Job.php
@@ -97,6 +97,7 @@ public function isScheduled(): bool
      * @link https://wordpress.stackexchange.com/a/223341
      *
      * @param string $time_string
+     *
      * @return int
      */
     public static function getTimestamp(string $time_string): int
diff --git a/classes/BlueChip/Security/Modules/Cron/Manager.php b/classes/BlueChip/Security/Modules/Cron/Manager.php
index 3ebf11f..d2a152e 100644
--- a/classes/BlueChip/Security/Modules/Cron/Manager.php
+++ b/classes/BlueChip/Security/Modules/Cron/Manager.php
@@ -33,7 +33,7 @@ public function __construct(Settings $settings)
     }
 
 
-    public function activate()
+    public function activate(): void
     {
         // Schedule cron jobs that are active.
         foreach ($this->jobs as $hook => $job) {
@@ -44,7 +44,7 @@ public function activate()
     }
 
 
-    public function deactivate()
+    public function deactivate(): void
     {
         // Unschedule all scheduled cron jobs.
         foreach ($this->jobs as $job) {
@@ -57,6 +57,7 @@ public function deactivate()
 
     /**
      * @param string $hook
+     *
      * @return \BlueChip\Security\Modules\Cron\Job
      */
     public function getJob(string $hook): Job
@@ -69,6 +70,7 @@ public function getJob(string $hook): Job
      * Activate cron job: schedule the job and mark it as permanently active if scheduling succeeds.
      *
      * @param string $hook
+     *
      * @return bool True if cron job has been activated or was active already, false otherwise.
      */
     public function activateJob(string $hook): bool
@@ -85,6 +87,7 @@ public function activateJob(string $hook): bool
      * Deactivate cron job: unschedule the job and mark it as permanently inactive if unscheduling succeeds.
      *
      * @param string $hook
+     *
      * @return bool True if cron job has been deactivated or was inactive already, false otherwise.
      */
     public function deactivateJob(string $hook): bool
diff --git a/classes/BlueChip/Security/Modules/Hardening/AdminPage.php b/classes/BlueChip/Security/Modules/Hardening/AdminPage.php
index d5a9517..d8b411c 100644
--- a/classes/BlueChip/Security/Modules/Hardening/AdminPage.php
+++ b/classes/BlueChip/Security/Modules/Hardening/AdminPage.php
@@ -2,8 +2,11 @@
 
 namespace BlueChip\Security\Modules\Hardening;
 
+use BlueChip\Security\Helpers\AdminNotices;
 use BlueChip\Security\Helpers\FormHelper;
 use BlueChip\Security\Helpers\HaveIBeenPwned;
+use BlueChip\Security\Modules\Log\AdminPage as LogAdminPage;
+use BlueChip\Security\Modules\Log\Events\LoginFailure;
 
 class AdminPage extends \BlueChip\Security\Core\Admin\AbstractPage
 {
@@ -29,16 +32,21 @@ public function __construct(Settings $settings)
     }
 
 
-    public function loadPage()
+    public function loadPage(): void
     {
         $this->displaySettingsErrors();
+
+        // Show warning if both default login options are disabled at the same time.
+        if ($this->settings[Settings::DISABLE_LOGIN_WITH_EMAIL] && $this->settings[Settings::DISABLE_LOGIN_WITH_USERNAME]) {
+            AdminNotices::add(__('Both default login options (login with email and login with username) are disabled. Make sure there is an alternative login option available.', 'bc-security'), AdminNotices::WARNING);
+        }
     }
 
 
     /**
      * Output page contents.
      */
-    public function printContents()
+    public function printContents(): void
     {
         echo '<div class="wrap">';
         echo '<h1>' . esc_html($this->page_title) . '</h1>';
@@ -51,7 +59,7 @@ public function printContents()
     /**
      * Initialize settings page: add sections and fields.
      */
-    public function initPage()
+    public function initPage(): void
     {
         // Register settings.
         $this->registerSettings();
@@ -145,6 +153,45 @@ function () {
             [FormHelper::class, 'printCheckbox']
         );
 
+        // Section: Disable login with username or email
+        $this->addSettingsSection(
+            'restrict-login-options',
+            __('Restrict login options', 'bc-security'),
+            function () {
+                echo '<p>' . esc_html__('WordPress by default allows users to log in with either their username or email. Disabling either of these two options can reduce risk from certain automated attacks:', 'bc-security') . '</p>';
+                echo '<ol>';
+                echo '<li>' . sprintf(
+                    /* translators: 1: Mitigation option title, 2: link to OWASP cheat sheet page on "Credential stuffing mitigation", 3: link to OWASP page on credential stuffing attacks */
+                    esc_html__('%1$s %2$s from %3$s.', 'bc-security'),
+                    '<strong>' . esc_html__('Disabling login with email', 'bc-security') . '</strong>',
+                    '<a href="https://cheatsheetseries.owasp.org/cheatsheets/Credential_Stuffing_Prevention_Cheat_Sheet.html#require-unpredictable-usernames" rel="noreferrer">' . esc_html__('reduces risk', 'bc-security') . '</a>',
+                    '<a href="https://owasp.org/www-community/attacks/Credential_stuffing" rel="noreferrer">' . esc_html__('credential stuffing attacks', 'bc-security') . '</a>'
+                ) . '</li>';
+                echo '<li>' . sprintf(
+                    /* translators: 1: Mitigation option title */
+                    esc_html__('%1$s renders brute-force attacks targeting existing usernames harmless.', 'bc-security'),
+                    '<strong>' . esc_html__('Disabling login with username', 'bc-security') . '</strong>',
+                ) . '</li>';
+                echo '</ol>';
+                echo '<p>' . sprintf(
+                    /* translators: 1: link to failed logins page */
+                    esc_html__('Examining %1$s may help to find out whether any of the options above makes sense for your website.', 'bc-security'),
+                    '<a href="' . LogAdminPage::getPageUrl(LoginFailure::ID) . '">' . esc_html__('failed login logs', 'bc-security') . '</a>'
+                ) . '</p>';
+                echo '<p><strong>' . esc_html__('Caution: You most likely do not want to disable both options at the same time unless there is an alternative login method provided!', 'bc-security') . '</strong></p>';
+            }
+        );
+        $this->addSettingsField(
+            Settings::DISABLE_LOGIN_WITH_EMAIL,
+            __('Disable login with email', 'bc-security'),
+            [FormHelper::class, 'printCheckbox']
+        );
+        $this->addSettingsField(
+            Settings::DISABLE_LOGIN_WITH_USERNAME,
+            __('Disable login with username', 'bc-security'),
+            [FormHelper::class, 'printCheckbox']
+        );
+
         // Section: Check/validate user passwords against Pwned Passwords database
         $this->addSettingsSection(
             'pwned-passwords',
diff --git a/classes/BlueChip/Security/Modules/Hardening/Core.php b/classes/BlueChip/Security/Modules/Hardening/Core.php
index e165c8d..a5c313b 100644
--- a/classes/BlueChip/Security/Modules/Hardening/Core.php
+++ b/classes/BlueChip/Security/Modules/Hardening/Core.php
@@ -44,7 +44,7 @@ public function __construct(Settings $settings)
     /**
      * Initialize WP hardening.
      */
-    public function init()
+    public function init(): void
     {
         if ($this->settings[Settings::DISABLE_PINGBACKS]) {
             // Disable pingbacks.
@@ -69,6 +69,20 @@ public function init()
                 add_action('parse_request', [$this, 'stopAuthorScan'], 10, 1);
             }
         }
+        if ($this->settings[Settings::DISABLE_LOGIN_WITH_EMAIL]) {
+            // Remove the option to authenticate with email and password.
+            // https://developer.wordpress.org/reference/hooks/authenticate/#more-information
+            remove_filter('authenticate', 'wp_authenticate_email_password', 20);
+            // Add a warning to the login screen.
+            add_filter('login_message', [$this, 'warnAboutDisabledLoginWithEmail'], 100, 0);
+        }
+        if ($this->settings[Settings::DISABLE_LOGIN_WITH_USERNAME]) {
+            // Remove the option to authenticate with username and password.
+            // https://developer.wordpress.org/reference/hooks/authenticate/#more-information
+            remove_filter('authenticate', 'wp_authenticate_username_password', 20);
+            // Add a warning to the login screen.
+            add_filter('login_message', [$this, 'warnAboutDisabledLoginWithUsername'], 100, 0);
+        }
         if ($this->settings[Settings::CHECK_PASSWORDS]) {
             // Check user password on successful login.
             add_action('wp_login', [$this, 'checkUserPassword'], 10, 2);
@@ -90,6 +104,7 @@ public function init()
      * @filter https://developer.wordpress.org/reference/hooks/xmlrpc_methods/
      *
      * @param array $methods
+     *
      * @return array
      */
     public function disablePingbacks(array $methods): array
@@ -105,6 +120,7 @@ public function disablePingbacks(array $methods): array
      * @filter https://developer.wordpress.org/reference/hooks/oembed_response_data/
      *
      * @param array $data
+     *
      * @return array
      */
     public function filterAuthorInOembed(array $data): array
@@ -125,6 +141,7 @@ public function filterAuthorInOembed(array $data): array
      * @param \WP_HTTP_Response|\WP_Error $response
      * @param array $handler
      * @param \WP_REST_Request $request
+     *
      * @return \WP_HTTP_Response|\WP_Error
      */
     public function filterJsonAPIAuthor($response, array $handler, \WP_REST_Request $request)
@@ -172,6 +189,7 @@ public function getUrlBase(): string
      * @filter https://developer.wordpress.org/reference/hooks/rest_post_dispatch/
      *
      * @param \WP_HTTP_Response $response
+     *
      * @return \WP_HTTP_Response
      */
     public function adjustJsonAPIHeaders(\WP_HTTP_Response $response): \WP_HTTP_Response
@@ -188,6 +206,7 @@ public function adjustJsonAPIHeaders(\WP_HTTP_Response $response): \WP_HTTP_Resp
      * @filter https://developer.wordpress.org/reference/hooks/request/
      *
      * @param array $query_vars
+     *
      * @return array
      */
     public function filterAuthorQuery(array $query_vars): array
@@ -207,6 +226,7 @@ public function filterAuthorQuery(array $query_vars): array
      * @link https://hackertarget.com/wordpress-user-enumeration/
      *
      * @param array $query_vars
+     *
      * @return bool True if `author` key is present and its value is either an array or can be seen as numeric.
      */
     protected static function smellsLikeAuthorScan(array $query_vars): bool
@@ -220,7 +240,7 @@ protected static function smellsLikeAuthorScan(array $query_vars): bool
      *
      * @param \WP $wp
      */
-    public function stopAuthorScan(\WP $wp)
+    public function stopAuthorScan(\WP $wp): void
     {
         if ($wp->query_vars[self::AUTHOR_SCAN_QUERY_VAR] ?? false) {
             status_header(404);
@@ -235,6 +255,24 @@ public function stopAuthorScan(\WP $wp)
     }
 
 
+    /**
+     * @return string HTML string with warning about login with email being disabled.
+     */
+    public function warnAboutDisabledLoginWithEmail(): string
+    {
+        return '<p class="message">' . sprintf(esc_html__('%s: Login with email is disabled on this website!', 'bc-security'), '<strong>' . esc_html__('Important', 'bc-security') . '</strong>') . '</p>';
+    }
+
+
+    /**
+     * @return string HTML string with warning about login with username being disabled.
+     */
+    public function warnAboutDisabledLoginWithUsername(): string
+    {
+        return '<p class="message">' . sprintf(esc_html__('%s: Login with username is disabled on this website!', 'bc-security'), '<strong>' . esc_html__('Important', 'bc-security') . '</strong>') . '</p>';
+    }
+
+
     /**
      * Check user password against Pwned Passwords database after successful login.
      *
@@ -243,7 +281,7 @@ public function stopAuthorScan(\WP $wp)
      * @param string $username
      * @param \WP_User $user
      */
-    public function checkUserPassword(string $username, \WP_User $user)
+    public function checkUserPassword(string $username, \WP_User $user): void
     {
         if (empty($password = \filter_input(INPUT_POST, 'pwd'))) {
             // Non-interactive sign on (probably).
@@ -267,7 +305,7 @@ public function checkUserPassword(string $username, \WP_User $user)
      *
      * @param \WP_Screen $screen
      */
-    public function displayPasswordPwnedNotice(\WP_Screen $screen)
+    public function displayPasswordPwnedNotice(\WP_Screen $screen): void
     {
         $user = wp_get_current_user();
 
@@ -302,7 +340,7 @@ public function displayPasswordPwnedNotice(\WP_Screen $screen)
      * @param bool $update Whether this is a user update.
      * @param object $user User object (passed by reference).
      */
-    public function validatePasswordUpdate(\WP_Error &$errors, bool $update, object &$user)
+    public function validatePasswordUpdate(\WP_Error &$errors, bool $update, object &$user): void
     {
         if ($errors->get_error_code()) {
             // There is an error reported already, skip the check.
@@ -326,7 +364,7 @@ public function validatePasswordUpdate(\WP_Error &$errors, bool $update, object
      * @param \WP_Error $errors
      * @param \WP_User|\WP_Error $user WP_User object if the login and reset key match. WP_Error object otherwise.
      */
-    public function validatePasswordReset(\WP_Error $errors, object $user)
+    public function validatePasswordReset(\WP_Error $errors, object $user): void
     {
         if ($errors->get_error_code()) {
             // There is an error reported already, skip the check.
@@ -348,7 +386,7 @@ public function validatePasswordReset(\WP_Error $errors, object $user)
      * @param string $password
      * @param \WP_Error $errors WP_Error object (passed by reference).
      */
-    protected static function checkIfPasswordHasBeenPwned(string $password, \WP_Error &$errors)
+    protected static function checkIfPasswordHasBeenPwned(string $password, \WP_Error &$errors): void
     {
         if (HaveIBeenPwned::hasPasswordBeenPwned($password)) {
             $message = \sprintf(
diff --git a/classes/BlueChip/Security/Modules/Hardening/Settings.php b/classes/BlueChip/Security/Modules/Hardening/Settings.php
index d6f7c79..0c14268 100644
--- a/classes/BlueChip/Security/Modules/Hardening/Settings.php
+++ b/classes/BlueChip/Security/Modules/Hardening/Settings.php
@@ -5,32 +5,42 @@
 class Settings extends \BlueChip\Security\Core\Settings
 {
     /**
-     * bool: Disable pingbacks? [No]
+     * @var string Disable pingbacks? [bool:no]
      */
     public const DISABLE_PINGBACKS = 'disable_pingbacks';
 
     /**
-     * bool: Disable XML RPC methods that require authentication? [No]
+     * @var string Disable XML RPC methods that require authentication? [bool:no]
      */
     public const DISABLE_XML_RPC = 'disable_xml_rpc';
 
     /**
-     * bool: Disable application passwords feature? [No]
+     * @var string Disable application passwords feature? [bool:no]
      */
     public const DISABLE_APPLICATION_PASSWORDS = 'disable_application_passwords';
 
     /**
-     * bool: Disable users listings via REST API `/wp/v2/users` endpoint and author scan via author=N query? [No]
+     * @var string Disable users listings via REST API `/wp/v2/users` endpoint and author scan via author=N query? [bool:no]
      */
     public const DISABLE_USERNAMES_DISCOVERY = 'disable_usernames_discovery';
 
     /**
-     * bool: Check existing passwords against Pwned Passwords database? [No]
+     * @var string Remove the option to log in with email and password? [bool:no]
+     */
+    public const DISABLE_LOGIN_WITH_EMAIL = 'disable_login_with_email';
+
+    /**
+     * @var string Remove the option to log in with username and password? [bool:no]
+     */
+    public const DISABLE_LOGIN_WITH_USERNAME = 'disable_login_with_username';
+
+    /**
+     * @var string Check existing passwords against Pwned Passwords database? [bool:no]
      */
     public const CHECK_PASSWORDS = 'check_passwords';
 
     /**
-     * bool: Validate new/updated passwords against Pwned Passwords database? [No]
+     * @var string Validate new/updated passwords against Pwned Passwords database? [bool:no]
      */
     public const VALIDATE_PASSWORDS = 'validate_passwords';
 
@@ -42,6 +52,8 @@ class Settings extends \BlueChip\Security\Core\Settings
         self::DISABLE_XML_RPC => false,
         self::DISABLE_APPLICATION_PASSWORDS => false,
         self::DISABLE_USERNAMES_DISCOVERY => false,
+        self::DISABLE_LOGIN_WITH_EMAIL => false,
+        self::DISABLE_LOGIN_WITH_USERNAME => false,
         self::CHECK_PASSWORDS => false,
         self::VALIDATE_PASSWORDS => false,
     ];
diff --git a/classes/BlueChip/Security/Modules/Initializable.php b/classes/BlueChip/Security/Modules/Initializable.php
index 06ffd85..780fd30 100644
--- a/classes/BlueChip/Security/Modules/Initializable.php
+++ b/classes/BlueChip/Security/Modules/Initializable.php
@@ -7,5 +7,5 @@ interface Initializable
     /**
      * Initialize module (perform any tasks that should be done init hook)
      */
-    public function init();
+    public function init(): void;
 }
diff --git a/classes/BlueChip/Security/Modules/Installable.php b/classes/BlueChip/Security/Modules/Installable.php
index 2b0b58e..57e72ce 100644
--- a/classes/BlueChip/Security/Modules/Installable.php
+++ b/classes/BlueChip/Security/Modules/Installable.php
@@ -7,10 +7,10 @@ interface Installable
     /**
      * Install module (add DB tables etc.)
      */
-    public function install();
+    public function install(): void;
 
     /**
      * Uninstall module (drop DB tables etc.)
      */
-    public function uninstall();
+    public function uninstall(): void;
 }
diff --git a/classes/BlueChip/Security/Modules/IpBlacklist/AdminPage.php b/classes/BlueChip/Security/Modules/IpBlacklist/AdminPage.php
index d06e828..52033c0 100644
--- a/classes/BlueChip/Security/Modules/IpBlacklist/AdminPage.php
+++ b/classes/BlueChip/Security/Modules/IpBlacklist/AdminPage.php
@@ -78,7 +78,7 @@ public function __construct(Manager $bl_manager, Cron\Manager $cron_manager)
     }
 
 
-    public function loadPage()
+    public function loadPage(): void
     {
         $this->resetCount();
         $this->processActions();
@@ -90,7 +90,7 @@ public function loadPage()
     /**
      * Output page contents.
      */
-    public function printContents()
+    public function printContents(): void
     {
         echo '<div class="wrap">';
         // Page heading
@@ -114,7 +114,7 @@ public function printContents()
      *
      * @hook \BlueChip\Security\Modules\IpBlacklist\Hooks::DEFAULT_MANUAL_LOCK_DURATION
      */
-    private function printBlacklistingForm()
+    private function printBlacklistingForm(): void
     {
         // IP address and lock scope can be "pre-filled".
         $ip_address = \filter_input(INPUT_GET, self::DEFAULT_IP_ADDRESS, FILTER_VALIDATE_IP);
@@ -193,7 +193,7 @@ private function printBlacklistingForm()
     /**
      * Output forms for IP blacklist pruning (including cron job activation and deactivation).
      */
-    private function printPruningActions()
+    private function printPruningActions(): void
     {
         echo '<h2>' . esc_html__('Blacklist pruning', 'bc-security') . '</h2>';
 
@@ -220,7 +220,7 @@ private function printPruningActions()
     /**
      * Initialize list table instance.
      */
-    private function initListTable()
+    private function initListTable(): void
     {
         $this->list_table = new ListTable($this->getUrl(), $this->per_page_option_name, $this->bl_manager);
         $this->list_table->processActions(); // may trigger wp_redirect()
@@ -232,7 +232,7 @@ private function initListTable()
     /**
      * Dispatch any action that is indicated by POST data (form submission).
      */
-    private function processActions()
+    private function processActions(): void
     {
         $nonce = \filter_input(INPUT_POST, self::NONCE_NAME, FILTER_SANITIZE_STRING);
         if (empty($nonce)) {
@@ -265,7 +265,7 @@ private function processActions()
     /**
      * Read POST data and attempt to add IP address to blacklist. Display notice about action outcome.
      */
-    private function processBlacklistAction()
+    private function processBlacklistAction(): void
     {
         $ip_address = \filter_input(INPUT_POST, 'ip-address', FILTER_VALIDATE_IP);
         $duration_length = \filter_input(INPUT_POST, 'duration-length', FILTER_VALIDATE_INT);
@@ -301,7 +301,7 @@ private function processBlacklistAction()
     /**
      * Attempt to prune blacklist table. Display notice about action outcome.
      */
-    private function processPruneAction()
+    private function processPruneAction(): void
     {
         if ($this->bl_manager->prune()) {
             AdminNotices::add(
@@ -320,7 +320,7 @@ private function processPruneAction()
     /**
      * Deactivate cron job for blacklist table pruning. Display notice about action outcome.
      */
-    private function processCronOffAction()
+    private function processCronOffAction(): void
     {
         $this->cron_manager->deactivateJob(Cron\Jobs::IP_BLACKLIST_CLEAN_UP);
         AdminNotices::add(
@@ -333,7 +333,7 @@ private function processCronOffAction()
     /**
      * Activate cron job for blacklist table pruning. Display notice about action outcome.
      */
-    private function processCronOnAction()
+    private function processCronOnAction(): void
     {
         if ($this->cron_manager->activateJob(Cron\Jobs::IP_BLACKLIST_CLEAN_UP)) {
             AdminNotices::add(
@@ -357,6 +357,7 @@ private function processCronOnAction()
      *
      * @param int $seconds
      * @param array $units_in_seconds
+     *
      * @return array
      */
     private function transformSecondsIntoFittingUnit(int $seconds, array $units_in_seconds): array
diff --git a/classes/BlueChip/Security/Modules/IpBlacklist/Bouncer.php b/classes/BlueChip/Security/Modules/IpBlacklist/Bouncer.php
index e5612f5..f3d857f 100644
--- a/classes/BlueChip/Security/Modules/IpBlacklist/Bouncer.php
+++ b/classes/BlueChip/Security/Modules/IpBlacklist/Bouncer.php
@@ -2,7 +2,7 @@
 
 namespace BlueChip\Security\Modules\IpBlacklist;
 
-use BlueChip\Security\Helpers;
+use BlueChip\Security\Helpers\Utils;
 
 /**
  * Bouncer takes care of bouncing uninvited guests by:
@@ -36,68 +36,37 @@ public function __construct(string $remote_address, Manager $bl_manager)
     /**
      * Load module.
      */
-    public function load()
+    public function load(): void
     {
-        // In case of non-cli context or if remote IP address is invalid, die immediately.
-        if (!Helpers\Is::cli() && empty($this->remote_address)) {
-            self::blockAccessTemporarily();
+        // Check if access to website is allowed from given remote address.
+        if ($this->bl_manager->isLocked($this->remote_address, LockScope::WEBSITE)) {
+            Utils::blockAccessTemporarily($this->remote_address);
         }
-
-        // Check if access to website is allowed.
-        add_filter('plugins_loaded', [$this, 'checkAccess'], 1, 0); // Leave priority 0 for site maintainers.
     }
 
 
     /**
      * Initialize module.
      */
-    public function init()
+    public function init(): void
     {
         add_filter('authenticate', [$this, 'checkLoginAttempt'], 1, 1); // Leave priority 0 for site maintainers.
     }
 
 
-    /**
-     * Terminate script execution via wp_die(), pass 503 as return code.
-     *
-     * @link https://httpstatusdogs.com/503-service-unavailable
-     *
-     * @param string $ip_address Remote IP address to include in error message [optional].
-     */
-    public static function blockAccessTemporarily(string $ip_address = '')
-    {
-        $error_msg = empty($ip_address)
-            ? esc_html__('Access from your device has been temporarily disabled for security reasons.', 'bc-security')
-            : \sprintf(esc_html__('Access from your IP address %1$s has been temporarily disabled for security reasons.', 'bc-security'), \sprintf('<em>%s</em>', $ip_address))
-        ;
-        //
-        wp_die($error_msg, __('Service Temporarily Unavailable', 'bc-security'), 503);
-    }
-
-
     //// Hookers - public methods that should in fact be private
 
-    /**
-     * Block access to the website when remote IP address is locked.
-     */
-    public function checkAccess()
-    {
-        if ($this->bl_manager->isLocked($this->remote_address, LockScope::WEBSITE)) {
-            self::blockAccessTemporarily($this->remote_address);
-        }
-    }
-
-
     /**
      * Block access to the login when remote IP address is locked.
      *
      * @param \WP_Error|\WP_User $user
+     *
      * @return \WP_Error|\WP_User
      */
     public function checkLoginAttempt($user)
     {
         if ($this->bl_manager->isLocked($this->remote_address, LockScope::ADMIN)) {
-            self::blockAccessTemporarily($this->remote_address);
+            Utils::blockAccessTemporarily($this->remote_address);
         }
 
         return $user;
diff --git a/classes/BlueChip/Security/Modules/IpBlacklist/ListTable.php b/classes/BlueChip/Security/Modules/IpBlacklist/ListTable.php
index 2574c60..04b6356 100644
--- a/classes/BlueChip/Security/Modules/IpBlacklist/ListTable.php
+++ b/classes/BlueChip/Security/Modules/IpBlacklist/ListTable.php
@@ -78,6 +78,7 @@ public function __construct(string $url, string $per_page_option_name, Manager $
      * Return content for first column (IP address) including row actions.
      *
      * @param array $item
+     *
      * @return string
      */
     public function column_ip_address(array $item): string // phpcs:ignore
@@ -90,6 +91,7 @@ public function column_ip_address(array $item): string // phpcs:ignore
      * Return content for "ban time" column.
      *
      * @param array $item
+     *
      * @return string
      */
     public function column_ban_time(array $item): string // phpcs:ignore
@@ -102,6 +104,7 @@ public function column_ban_time(array $item): string // phpcs:ignore
      * Return content for "release time" column.
      *
      * @param array $item
+     *
      * @return string
      */
     public function column_release_time(array $item): string // phpcs:ignore
@@ -114,6 +117,7 @@ public function column_release_time(array $item): string // phpcs:ignore
      * Return human readable value for ban reason table column.
      *
      * @param array $item
+     *
      * @return string
      */
     public function column_reason(array $item): string // phpcs:ignore
@@ -125,7 +129,7 @@ public function column_reason(array $item): string // phpcs:ignore
     /**
      * Display (dismissible) admin notices informing user that an action has been performed successfully.
      */
-    public function displayNotices()
+    public function displayNotices(): void
     {
         $this->displayNotice(
             self::NOTICE_RECORD_REMOVED,
@@ -231,6 +235,8 @@ protected function get_views() // phpcs:ignore
 
     /**
      * Prepare items for table.
+     *
+     * @return void
      */
     public function prepare_items() // phpcs:ignore
     {
@@ -253,7 +259,7 @@ public function prepare_items() // phpcs:ignore
      *
      * @return void
      */
-    public function processActions()
+    public function processActions(): void
     {
         // Remove or unlock single record?
         if (($action = \filter_input(INPUT_GET, 'action'))) {
@@ -302,6 +308,7 @@ public function processActions()
      * Translate integer code for ban reason into something human can read.
      *
      * @param int $banReason
+     *
      * @return string
      */
     private function explainBanReason(int $banReason): string
diff --git a/classes/BlueChip/Security/Modules/IpBlacklist/Manager.php b/classes/BlueChip/Security/Modules/IpBlacklist/Manager.php
index 22fa33a..b7b98f1 100644
--- a/classes/BlueChip/Security/Modules/IpBlacklist/Manager.php
+++ b/classes/BlueChip/Security/Modules/IpBlacklist/Manager.php
@@ -60,7 +60,7 @@ public function __construct(\wpdb $wpdb)
     /**
      * @link https://codex.wordpress.org/Creating_Tables_with_Plugins#Creating_or_Updating_the_Table
      */
-    public function install()
+    public function install(): void
     {
         // To have dbDelta()
         require_once ABSPATH . 'wp-admin/includes/upgrade.php';
@@ -83,13 +83,13 @@ public function install()
     }
 
 
-    public function uninstall()
+    public function uninstall(): void
     {
         $this->wpdb->query(\sprintf('DROP TABLE IF EXISTS %s', $this->blacklist_table));
     }
 
 
-    public function init()
+    public function init(): void
     {
         // Hook into cron job execution.
         add_action(Modules\Cron\Jobs::IP_BLACKLIST_CLEAN_UP, [$this, 'prune'], 10, 0);
@@ -113,6 +113,7 @@ public function count(): int
      * @internal Implements \BlueChip\Security\Modules\Countable interface.
      *
      * @param int $scope
+     *
      * @return int
      */
     public function countAll(int $scope = LockScope::ANY): int
@@ -133,10 +134,12 @@ public function countAll(int $scope = LockScope::ANY): int
      * @internal Implements \BlueChip\Security\Modules\Countable interface.
      *
      * @param int $timestamp
+     *
      * @return int
      */
     public function countFrom(int $timestamp): int
     {
+        /** @var string $query */
         $query = $this->wpdb->prepare(
             "SELECT COUNT(id) AS total FROM {$this->blacklist_table} WHERE ban_time > %s",
             MySQLDateTime::formatDateTime($timestamp)
@@ -154,6 +157,7 @@ public function countFrom(int $timestamp): int
      * @param int $limit
      * @param string $order_by
      * @param string $order
+     *
      * @return array
      */
     public function fetch(int $scope = LockScope::ANY, int $from = 0, int $limit = 20, string $order_by = '', string $order = ''): array
@@ -191,6 +195,7 @@ public function fetch(int $scope = LockScope::ANY, int $from = 0, int $limit = 2
      * Fetch all items on blacklist (optionally with given $scope).
      *
      * @param int $scope Blacklist scope [optional].
+     *
      * @return array
      */
     public function fetchAll(int $scope = LockScope::ANY): array
@@ -215,12 +220,14 @@ public function fetchAll(int $scope = LockScope::ANY): array
      *
      * @param string $ip_address IP address to check.
      * @param int $scope Blacklist scope.
+     *
      * @return bool True if IP address is on blacklist with given scope.
      */
     public function isLocked(string $ip_address, int $scope): bool
     {
         // Prepare query. Because of different ban reasons, multiple records may
         // match the where condition, so pick up the most future release time.
+        /** @var string $query */
         $query = $this->wpdb->prepare(
             "SELECT MAX(release_time) FROM {$this->blacklist_table} WHERE scope = %d AND ip_address = %s",
             $scope,
@@ -243,6 +250,7 @@ public function isLocked(string $ip_address, int $scope): bool
      * @param int $scope
      * @param int $reason
      * @param string $comment [optional]
+     *
      * @return bool True if IP address has been locked, false otherwise.
      */
     public function lock(string $ip_address, int $duration, int $scope, int $reason, string $comment = ''): bool
@@ -287,6 +295,7 @@ public function prune(): bool
     {
         // Prepare query
         // Note: $wpdb->delete cannot be used as it does not support "<=" comparison)
+        /** @var string $query */
         $query = $this->wpdb->prepare(
             "DELETE FROM {$this->blacklist_table} WHERE release_time <= %s",
             MySQLDateTime::formatDateTime(\time())
@@ -302,6 +311,7 @@ public function prune(): bool
      * Remove record with primary key $id.
      *
      * @param int $id
+     *
      * @return bool True if record with $id has been removed, false otherwise.
      */
     public function remove(int $id): bool
@@ -317,6 +327,7 @@ public function remove(int $id): bool
      * Remove records with given primary keys.
      *
      * @param array $ids
+     *
      * @return int Number of deleted records.
      */
     public function removeMany(array $ids): int
@@ -344,6 +355,7 @@ public function removeMany(array $ids): int
      * @todo Only unlock really active locks.
      *
      * @param int $id
+     *
      * @return bool True if record with $id has been unlocked, false otherwise.
      */
     public function unlock(int $id): bool
@@ -367,6 +379,7 @@ public function unlock(int $id): bool
      * @todo Only unlock really active locks.
      *
      * @param array $ids
+     *
      * @return int Number of unlocked records.
      */
     public function unlockMany(array $ids): int
@@ -396,11 +409,13 @@ public function unlockMany(array $ids): int
      * @param string $ip_address IP address to check.
      * @param int $scope
      * @param int $reason
+     *
      * @return int|null Record ID or null if no record with given $ip_address, $scope and ban $reason exists.
      */
     protected function getId(string $ip_address, int $scope, int $reason): ?int
     {
         // Prepare query.
+        /** @var string $query */
         $query = $this->wpdb->prepare(
             "SELECT id FROM {$this->blacklist_table} WHERE scope = %d AND ip_address = %s AND reason = %d",
             $scope,
diff --git a/classes/BlueChip/Security/Modules/Loadable.php b/classes/BlueChip/Security/Modules/Loadable.php
index 172d14e..0425453 100644
--- a/classes/BlueChip/Security/Modules/Loadable.php
+++ b/classes/BlueChip/Security/Modules/Loadable.php
@@ -7,5 +7,5 @@ interface Loadable
     /**
      * Load module (perform any tasks that should be done immediately on plugin load)
      */
-    public function load();
+    public function load(): void;
 }
diff --git a/classes/BlueChip/Security/Modules/Log/Action.php b/classes/BlueChip/Security/Modules/Log/Action.php
index 2dbc6d9..a45cec2 100644
--- a/classes/BlueChip/Security/Modules/Log/Action.php
+++ b/classes/BlueChip/Security/Modules/Log/Action.php
@@ -7,24 +7,53 @@
  */
 interface Action
 {
-    /** @var string Log action with event object */
+    /**
+     * @var string Log action with event object
+     */
     public const EVENT     = 'bc-security.log.event';
-    /** @var string Log action without explicit log level */
+
+    /**
+     * @var string Log action without explicit log level
+     */
     public const LOG       = 'bc-security.log';
-    /** @var string Log action with debug log level */
+
+    /**
+     * @var string Log action with debug log level
+     */
     public const DEBUG     = 'bc-security.log.debug';
-    /** @var string Log action with info log level */
+
+    /**
+     * @var string Log action with info log level
+     */
     public const INFO      = 'bc-security.log.info';
-    /** @var string Log action with notice log level */
+
+    /**
+     * @var string Log action with notice log level
+     */
     public const NOTICE    = 'bc-security.log.notice';
-    /** @var string Log action with warning log level */
+
+    /**
+     * @var string Log action with warning log level
+     */
     public const WARNING   = 'bc-security.log.warning';
-    /** @var string Log action with error log level */
+
+    /**
+     * @var string Log action with error log level
+     */
     public const ERROR     = 'bc-security.log.error';
-    /** @var string Log action with critical log level */
+
+    /**
+     * @var string Log action with critical log level
+     */
     public const CRITICAL  = 'bc-security.log.critical';
-    /** @var string Log action with alert log level */
+
+    /**
+     * @var string Log action with alert log level
+     */
     public const ALERT     = 'bc-security.log.alert';
-    /** @var string Log action with emergency log level */
+
+    /**
+     * @var string Log action with emergency log level
+     */
     public const EMERGENCY = 'bc-security.log.emergency';
 }
diff --git a/classes/BlueChip/Security/Modules/Log/AdminPage.php b/classes/BlueChip/Security/Modules/Log/AdminPage.php
index 7605670..dc8d47a 100644
--- a/classes/BlueChip/Security/Modules/Log/AdminPage.php
+++ b/classes/BlueChip/Security/Modules/Log/AdminPage.php
@@ -48,10 +48,21 @@ public function __construct(Settings $settings, Logger $logger)
     }
 
 
+    /**
+     * @param string|null $event_id [optional] If provided, URL to list table view for given event is returned.
+     *
+     * @return string URL of admin page.
+     */
+    public static function getPageUrl(?string $event_id = null): string
+    {
+        return ($event_id === null) ? parent::getPageUrl() : ListTable::getViewUrl(parent::getPageUrl(), $event_id);
+    }
+
+
     /**
      * Initialize settings page: add sections and fields.
      */
-    public function initPage()
+    public function initPage(): void
     {
         // Register settings.
         $this->registerSettings();
@@ -84,7 +95,7 @@ function () {
     }
 
 
-    public function loadPage()
+    public function loadPage(): void
     {
         $this->resetCount();
         $this->displaySettingsErrors();
@@ -96,7 +107,7 @@ public function loadPage()
     /**
      * Output page contents.
      */
-    public function printContents()
+    public function printContents(): void
     {
         echo '<div class="wrap">';
 
@@ -119,7 +130,7 @@ public function printContents()
     /**
      * Initialize list table instance.
      */
-    private function initListTable()
+    private function initListTable(): void
     {
         $this->list_table = new ListTable($this->getUrl(), $this->per_page_option_name, $this->logger);
         $this->list_table->prepare_items();
diff --git a/classes/BlueChip/Security/Modules/Log/Event.php b/classes/BlueChip/Security/Modules/Log/Event.php
index 7529407..454c69c 100644
--- a/classes/BlueChip/Security/Modules/Log/Event.php
+++ b/classes/BlueChip/Security/Modules/Log/Event.php
@@ -89,12 +89,13 @@ public function explainContext(): array
      * property PHPDoc comment.
      *
      * @param \ReflectionProperty $property
+     *
      * @return string
      */
     private static function getPropertyLabel(\ReflectionProperty $property): string
     {
         $matches = [];
-        if (\preg_match("/__\('(.+)'\)/i", $property->getDocComment(), $matches)) {
+        if (\preg_match("/__\('(.+)'\)/i", $property->getDocComment() ?: '', $matches)) {
             return __($matches[1], 'bc-security');
         } else {
             return '';
diff --git a/classes/BlueChip/Security/Modules/Log/Events/LoginFailure.php b/classes/BlueChip/Security/Modules/Log/Events/LoginFailure.php
index 1917ca2..57817d3 100644
--- a/classes/BlueChip/Security/Modules/Log/Events/LoginFailure.php
+++ b/classes/BlueChip/Security/Modules/Log/Events/LoginFailure.php
@@ -59,7 +59,7 @@ public function getMessage(): string
      */
     public function setError(\WP_Error $error): self
     {
-        $this->error_code = $error->get_error_code();
+        $this->error_code = (string) $error->get_error_code();
         $this->error_message = $error->get_error_message();
         return $this;
     }
diff --git a/classes/BlueChip/Security/Modules/Log/EventsManager.php b/classes/BlueChip/Security/Modules/Log/EventsManager.php
index 558b788..966c27f 100644
--- a/classes/BlueChip/Security/Modules/Log/EventsManager.php
+++ b/classes/BlueChip/Security/Modules/Log/EventsManager.php
@@ -7,6 +7,9 @@
  */
 abstract class EventsManager
 {
+    /**
+     * @var array
+     */
     private static $mapping = [
         Events\AuthBadCookie::ID => Events\AuthBadCookie::class,
         Events\LoginFailure::ID => Events\LoginFailure::class,
@@ -20,6 +23,7 @@ abstract class EventsManager
      * Create event object for given $id.
      *
      * @param string $event_id Valid event ID.
+     *
      * @return \BlueChip\Security\Modules\Log\Event|null
      */
     public static function create(string $event_id): ?Event
@@ -43,7 +47,7 @@ public static function getMapping(): array
     /**
      * Return list of event instances indexed by their IDs.
      *
-     * @return \BlueChip\Security\Modules\Log\Event[]
+     * @return array
      */
     public static function getInstances(): array
     {
diff --git a/classes/BlueChip/Security/Modules/Log/EventsMonitor.php b/classes/BlueChip/Security/Modules/Log/EventsMonitor.php
index 0ec953d..d3ef0e1 100644
--- a/classes/BlueChip/Security/Modules/Log/EventsMonitor.php
+++ b/classes/BlueChip/Security/Modules/Log/EventsMonitor.php
@@ -28,7 +28,7 @@ public function __construct(string $remote_address, string $server_address)
     }
 
 
-    public function init()
+    public function init(): void
     {
         // Log the following WordPress events:
         // - bad authentication cookie
@@ -58,7 +58,7 @@ public function init()
      *
      * @param \WP $wp
      */
-    public function log404Queries(\WP $wp)
+    public function log404Queries(\WP $wp): void
     {
         /** @var \WP_Query $wp_query */
         global $wp_query;
@@ -74,7 +74,7 @@ public function log404Queries(\WP $wp)
      *
      * @param array $cookie_elements
      */
-    public function logBadCookie(array $cookie_elements)
+    public function logBadCookie(array $cookie_elements): void
     {
         do_action(Action::EVENT, (new Events\AuthBadCookie())->setUsername($cookie_elements['username']));
     }
@@ -86,7 +86,7 @@ public function logBadCookie(array $cookie_elements)
      * @param string $username
      * @param \WP_Error $error
      */
-    public function logFailedLogin(string $username, \WP_Error $error)
+    public function logFailedLogin(string $username, \WP_Error $error): void
     {
         do_action(Action::EVENT, (new Events\LoginFailure())->setUsername($username)->setError($error));
     }
@@ -97,7 +97,7 @@ public function logFailedLogin(string $username, \WP_Error $error)
      *
      * @param string $username
      */
-    public function logSuccessfulLogin(string $username)
+    public function logSuccessfulLogin(string $username): void
     {
         do_action(Action::EVENT, (new Events\LoginSuccessful())->setUsername($username));
     }
@@ -110,7 +110,7 @@ public function logSuccessfulLogin(string $username)
      * @param string $username
      * @param int $duration
      */
-    public function logLockoutEvent(string $remote_address, string $username, int $duration)
+    public function logLockoutEvent(string $remote_address, string $username, int $duration): void
     {
         do_action(Action::EVENT, (new Events\LoginLockout())->setDuration($duration)->setIpAddress($remote_address)->setUsername($username));
     }
diff --git a/classes/BlueChip/Security/Modules/Log/ListTable.php b/classes/BlueChip/Security/Modules/Log/ListTable.php
index 6c5bbf1..54a496b 100644
--- a/classes/BlueChip/Security/Modules/Log/ListTable.php
+++ b/classes/BlueChip/Security/Modules/Log/ListTable.php
@@ -9,17 +9,25 @@
  */
 class ListTable extends \BlueChip\Security\Core\ListTable
 {
-    /** @var string Name of blacklist action query argument */
+    /**
+     * @var string Name of blacklist action query argument
+     */
     private const ACTION_BLACKLIST = 'blacklist';
 
-    /** @var string Name of view query argument */
+    /**
+     * @var string Name of view query argument
+     */
     private const VIEW_EVENT = 'event';
 
 
-    /** @var \BlueChip\Security\Modules\Log\Logger */
+    /**
+     * @var \BlueChip\Security\Modules\Log\Logger
+     */
     private $logger;
 
-    /** @var \BlueChip\Security\Modules\Log\Event|null */
+    /**
+     * @var \BlueChip\Security\Modules\Log\Event|null
+     */
     private $event = null;
 
 
@@ -43,10 +51,23 @@ public function __construct(string $url, string $per_page_option_name, Logger $l
     }
 
 
+    /**
+     * @param string $url
+     * @param string $event_id
+     *
+     * @return string URL made from $url with query argument for view with $event_id appended.
+     */
+    public static function getViewUrl(string $url, string $event_id): string
+    {
+        return add_query_arg(self::VIEW_EVENT, $event_id, $url);
+    }
+
+
     /**
      * Return content for first column (date and time) including row actions.
      *
      * @param array $item
+     *
      * @return string
      */
     public function column_date_and_time(array $item): string // phpcs:ignore
@@ -60,6 +81,7 @@ public function column_date_and_time(array $item): string // phpcs:ignore
      *
      * @param array $item
      * @param string $column_name
+     *
      * @return string
      */
     public function column_default($item, $column_name) // phpcs:ignore
@@ -79,6 +101,7 @@ public function column_default($item, $column_name) // phpcs:ignore
      * Return content for event type column.
      *
      * @param array $item
+     *
      * @return string
      */
     public function column_event(array $item): string // phpcs:ignore
@@ -93,6 +116,7 @@ public function column_event(array $item): string // phpcs:ignore
      * Return content for IP address column.
      *
      * @param array $item
+     *
      * @return string
      */
     public function column_ip_address(array $item): string // phpcs:ignore
@@ -110,6 +134,7 @@ public function column_ip_address(array $item): string // phpcs:ignore
      * Return content for message column.
      *
      * @param array $item
+     *
      * @return string
      */
     public function column_message(array $item): string // phpcs:ignore
@@ -122,6 +147,7 @@ public function column_message(array $item): string // phpcs:ignore
 
     /**
      * Define table columns
+     *
      * @return array
      */
     public function get_columns() // phpcs:ignore
@@ -149,6 +175,7 @@ public function get_columns() // phpcs:ignore
 
     /**
      * Define sortable columns
+     *
      * @return array
      */
     public function get_sortable_columns() // phpcs:ignore
@@ -163,6 +190,7 @@ public function get_sortable_columns() // phpcs:ignore
 
     /**
      * Define available views for this table.
+     *
      * @return array
      */
     protected function get_views() // phpcs:ignore
@@ -197,6 +225,8 @@ protected function get_views() // phpcs:ignore
 
     /**
      * Prepare items for table.
+     *
+     * @return void
      */
     public function prepare_items() // phpcs:ignore
     {
@@ -218,6 +248,7 @@ public function prepare_items() // phpcs:ignore
 
     /**
      * @param array $item
+     *
      * @return array
      */
     private function getRowActions(array $item): array
@@ -249,6 +280,7 @@ private function getRowActions(array $item): array
      * @see \BlueChip\Security\Modules\IpBlacklist\LockScope
      *
      * @param string $event_id One from event IDs defined in \BlueChip\Security\Modules\Log\Event.
+     *
      * @return int Lock scope code. LockScope::ANY indicates that given event does not warrant blacklisting.
      */
     private function getLockScopeFromEvent(string $event_id): int
@@ -271,6 +303,7 @@ private function getLockScopeFromEvent(string $event_id): int
      *
      * @param string $message
      * @param array $context
+     *
      * @return string
      */
     private static function formatMessage(string $message, array $context): string
diff --git a/classes/BlueChip/Security/Modules/Log/Logger.php b/classes/BlueChip/Security/Modules/Log/Logger.php
index f1acd0a..715d8bb 100644
--- a/classes/BlueChip/Security/Modules/Log/Logger.php
+++ b/classes/BlueChip/Security/Modules/Log/Logger.php
@@ -59,7 +59,7 @@ public function __construct(\wpdb $wpdb, string $remote_address, Settings $setti
     /**
      * @link https://codex.wordpress.org/Creating_Tables_with_Plugins#Creating_or_Updating_the_Table
      */
-    public function install()
+    public function install(): void
     {
         // To have dbDelta()
         require_once ABSPATH . 'wp-admin/includes/upgrade.php';
@@ -83,13 +83,13 @@ public function install()
     }
 
 
-    public function uninstall()
+    public function uninstall(): void
     {
         $this->wpdb->query(\sprintf('DROP TABLE IF EXISTS %s', $this->log_table));
     }
 
 
-    public function load()
+    public function load(): void
     {
         // Expose log methods via do_action() - inspired by Wonolog:
         // https://github.com/inpsyde/Wonolog/blob/master/docs/02-basic-wonolog-concepts.md#level-rich-log-hooks
@@ -106,7 +106,7 @@ public function load()
     }
 
 
-    public function init()
+    public function init(): void
     {
         // Hook into cron job execution.
         add_action(Modules\Cron\Jobs::LOGS_CLEAN_UP_BY_AGE, [$this, 'pruneByAge'], 10, 0);
@@ -174,7 +174,7 @@ public function log($level, $message, array $context = [])
      *
      * @param \BlueChip\Security\Modules\Log\Event $event
      */
-    public function logEvent(Event $event)
+    public function logEvent(Event $event): void
     {
         // Include event ID in context.
         $this->log($event->getLogLevel(), $event->getMessage(), \array_merge(['event' => $event->getId()], $event->getContext()));
@@ -185,6 +185,7 @@ public function logEvent(Event $event)
      * Return integer code for given log level.
      *
      * @param string $level Log level constant: emergency, alert, critical, error, warning, notice, info or debug.
+     *
      * @return int|null Integer code for given log level or null if unknown level given.
      */
     public function translateLogLevel(string $level): ?int
@@ -218,7 +219,7 @@ public function translateLogLevel(string $level): ?int
      *
      * @param \BlueChip\Security\Modules\Services\ReverseDnsLookup\Response $response
      */
-    public function processReverseDnsLookupResponse(ReverseDnsLookup\Response $response)
+    public function processReverseDnsLookupResponse(ReverseDnsLookup\Response $response): void
     {
         $this->wpdb->update(
             $this->log_table,
@@ -247,6 +248,7 @@ public function count(): int
      * @internal Implements \BlueChip\Security\Modules\Countable interface.
      *
      * @param string|null $event Only count records under event name (empty string is allowed).
+     *
      * @return int
      */
     public function countAll(?string $event = null): int
@@ -268,10 +270,12 @@ public function countAll(?string $event = null): int
      * @internal Implements \BlueChip\Security\Modules\Countable interface.
      *
      * @param int $timestamp
+     *
      * @return int
      */
     public function countFrom(int $timestamp): int
     {
+        /** @var string $query */
         $query = $this->wpdb->prepare(
             "SELECT COUNT(id) AS total FROM {$this->log_table} WHERE date_and_time > %s",
             MySQLDateTime::formatDateTime($timestamp)
@@ -289,6 +293,7 @@ public function countFrom(int $timestamp): int
      * @param int $limit [optional] Maximum number of items to be returned. Default value is 20.
      * @param string $order_by [optional] Column name to order the records by.
      * @param string $order [optional] Order direction, either "asc" or "desc".
+     *
      * @return array
      */
     public function fetch(?string $event = null, int $from = 0, int $limit = 20, string $order_by = '', string $order = ''): array
@@ -329,11 +334,12 @@ public function fetch(?string $event = null, int $from = 0, int $limit = 20, str
      */
     public function getKnownIps(): array
     {
-        $result = $this->wpdb->get_results(
-            $this->wpdb->prepare("SELECT DISTINCT(ip_address) FROM {$this->log_table} WHERE event = %s", Events\LoginSuccessful::ID)
-        );
+        /** @var string $query */
+        $query = $this->wpdb->prepare("SELECT DISTINCT(ip_address) FROM {$this->log_table} WHERE event = %s", Events\LoginSuccessful::ID);
+
+        $result = $this->wpdb->get_results($query, ARRAY_A);
 
-        return \is_array($result) ? wp_list_pluck($result, 'ip_address') : [];
+        return \is_array($result) ? \array_column($result, 'ip_address') : [];
     }
 
 
@@ -358,6 +364,7 @@ public function pruneByAge(): bool
         $max_age = $this->settings->getMaxAge();
 
         // Note: $wpdb->delete cannot be used as it does not support "<=" comparison)
+        /** @var string $query */
         $query = $this->wpdb->prepare(
             "DELETE FROM {$this->log_table} WHERE date_and_time <= %s",
             MySQLDateTime::formatDateTime(\time() - $max_age)
@@ -382,12 +389,14 @@ public function pruneBySize(): bool
         }
 
         // Find the biggest ID from all records that should be pruned.
+        /** @var string $query_id */
         $query_id = $this->wpdb->prepare("SELECT id FROM {$this->log_table} ORDER BY id DESC LIMIT %d, 1", $max_size);
         if (empty($id = (int) $this->wpdb->get_var($query_id))) {
             return false;
         }
 
         // Note: $wpdb->delete cannot be used as it does not support "<=" comparison)
+        /** @var string $query */
         $query = $this->wpdb->prepare("DELETE FROM {$this->log_table} WHERE id <= %d", $id);
         // Execute query and return true/false status.
         return $this->wpdb->query($query) !== false;
diff --git a/classes/BlueChip/Security/Modules/Log/Settings.php b/classes/BlueChip/Security/Modules/Log/Settings.php
index 2bc7e9e..077543b 100644
--- a/classes/BlueChip/Security/Modules/Log/Settings.php
+++ b/classes/BlueChip/Security/Modules/Log/Settings.php
@@ -7,10 +7,10 @@
  */
 class Settings extends \BlueChip\Security\Core\Settings
 {
-    /** int: Maximum size of log table in thousands of records [20] */
+    /** @var string Maximum size of log table in thousands of records [int:20] */
     public const LOG_MAX_SIZE = 'log_max_size';
 
-    /** int: Maximum age of log record in days [365] */
+    /** @var string Maximum age of log record in days [int:365] */
     public const LOG_MAX_AGE = 'log_max_age';
 
 
diff --git a/classes/BlueChip/Security/Modules/Login/AdminPage.php b/classes/BlueChip/Security/Modules/Login/AdminPage.php
index d62eb45..6dcd684 100644
--- a/classes/BlueChip/Security/Modules/Login/AdminPage.php
+++ b/classes/BlueChip/Security/Modules/Login/AdminPage.php
@@ -28,7 +28,7 @@ public function __construct(Settings $settings)
     }
 
 
-    public function loadPage()
+    public function loadPage(): void
     {
         $this->displaySettingsErrors();
     }
@@ -37,7 +37,7 @@ public function loadPage()
     /**
      * Output page contents.
      */
-    public function printContents()
+    public function printContents(): void
     {
         echo '<div class="wrap">';
         echo '<h1>' . esc_html($this->page_title) . '</h1>';
@@ -49,7 +49,7 @@ public function printContents()
     /**
      * Initialize settings page: add sections and fields.
      */
-    public function initPage()
+    public function initPage(): void
     {
         // Register settings.
         $this->registerSettings();
@@ -117,17 +117,6 @@ function () {
             [ 'append' => __('Enter one username per line.', 'bc-security'), ]
         );
 
-        // Section: Authentication cookies
-        $this->addSettingsSection(
-            'auth-cookies',
-            _x('Auth cookies', 'Settings section title', 'bc-security')
-        );
-        $this->addSettingsField(
-            Settings::CHECK_COOKIES,
-            __('Check auth cookies', 'bc-security'),
-            [FormHelper::class, 'printCheckbox']
-        );
-
         // Section: Display generic error message on failed login
         $this->addSettingsSection(
             'generic-error-message',
diff --git a/classes/BlueChip/Security/Modules/Login/Bookkeeper.php b/classes/BlueChip/Security/Modules/Login/Bookkeeper.php
index 7fdfc3b..7979a47 100644
--- a/classes/BlueChip/Security/Modules/Login/Bookkeeper.php
+++ b/classes/BlueChip/Security/Modules/Login/Bookkeeper.php
@@ -46,7 +46,7 @@ public function __construct(Settings $settings, \wpdb $wpdb)
     /**
      * @link https://codex.wordpress.org/Creating_Tables_with_Plugins#Creating_or_Updating_the_Table
      */
-    public function install()
+    public function install(): void
     {
         // To have dbDelta()
         require_once ABSPATH . 'wp-admin/includes/upgrade.php';
@@ -67,7 +67,7 @@ public function install()
     }
 
 
-    public function uninstall()
+    public function uninstall(): void
     {
         $this->wpdb->query(\sprintf('DROP TABLE IF EXISTS %s', $this->failed_logins_table));
     }
@@ -78,6 +78,7 @@ public function uninstall()
      *
      * @param string $ip_address
      * @param string $username
+     *
      * @return int Number of non-expired failed login attempts for $ip_address.
      */
     public function recordFailedLoginAttempt(string $ip_address, string $username): int
@@ -96,6 +97,7 @@ public function recordFailedLoginAttempt(string $ip_address, string $username):
         $this->wpdb->insert($this->failed_logins_table, $data, ['%s', '%s', '%s', '%d']);
 
         // Get count of all unexpired failed login attempts for given IP address.
+        /** @var string $query */
         $query = $this->wpdb->prepare(
             "SELECT COUNT(*) AS retries_count FROM {$this->failed_logins_table} WHERE ip_address = %s AND date_and_time > %s",
             $ip_address,
@@ -117,6 +119,7 @@ public function prune()
         $threshold = \time() - $this->settings->getResetTimeoutDuration();
         // Prepare query.
         // Note: $wpdb->delete cannot be used as it does not support "<" comparison)
+        /** @var string $query */
         $query = $this->wpdb->prepare(
             "DELETE FROM {$this->failed_logins_table} WHERE date_and_time <= %s",
             MySQLDateTime::formatDateTime($threshold)
diff --git a/classes/BlueChip/Security/Modules/Login/Gatekeeper.php b/classes/BlueChip/Security/Modules/Login/Gatekeeper.php
index efadf31..8e5c09d 100644
--- a/classes/BlueChip/Security/Modules/Login/Gatekeeper.php
+++ b/classes/BlueChip/Security/Modules/Login/Gatekeeper.php
@@ -2,6 +2,7 @@
 
 namespace BlueChip\Security\Modules\Login;
 
+use BlueChip\Security\Helpers\Utils;
 use BlueChip\Security\Modules\IpBlacklist;
 
 /**
@@ -46,12 +47,13 @@ public function __construct(Settings $settings, string $remote_address, Bookkeep
 
 
     /**
-     * Check if IP is locked early on, but allow other plugins to interfere.
+     * Load module.
      */
-    public function load()
+    public function load(): void
     {
-        if ($this->settings[Settings::CHECK_COOKIES]) {
-            add_action('plugins_loaded', [$this, 'removeAuthCookieIfIpIsLocked'], 5, 0);
+        // Remove all WordPress authentication cookies if remote address is on black list.
+        if ($this->bl_manager->isLocked($this->remote_address, IpBlacklist\LockScope::ADMIN)) {
+            $this->clearAuthCookie();
         }
     }
 
@@ -59,7 +61,7 @@ public function load()
     /**
      * Initialize login hardening.
      */
-    public function init()
+    public function init(): void
     {
         add_filter('illegal_user_logins', [$this, 'filterIllegalUserLogins'], 10, 1);
 
@@ -72,10 +74,9 @@ public function init()
 
         add_action('wp_login_failed', [$this, 'handleFailedLogin'], 100, 1);
 
-        if ($this->settings[Settings::CHECK_COOKIES]) {
-            add_action('auth_cookie_bad_username', [$this, 'handleBadCookie'], 10, 1);
-            add_action('auth_cookie_bad_hash', [$this, 'handleBadCookie'], 10, 1);
-        }
+        // Check authentication cookies:
+        add_action('auth_cookie_bad_username', [$this, 'handleBadCookie'], 10, 1);
+        add_action('auth_cookie_bad_hash', [$this, 'handleBadCookie'], 10, 1);
     }
 
 
@@ -87,6 +88,7 @@ public function init()
      * @filter https://developer.wordpress.org/reference/hooks/illegal_user_logins/
      *
      * @param array $usernames
+     *
      * @return array
      */
     public function filterIllegalUserLogins(array $usernames): array
@@ -99,6 +101,7 @@ public function filterIllegalUserLogins(array $usernames): array
      * Let generic `authentication_failed` error shake the login form.
      *
      * @param array $error_codes
+     *
      * @return array
      */
     public function filterShakeErrorCodes(array $error_codes): array
@@ -109,12 +112,11 @@ public function filterShakeErrorCodes(array $error_codes): array
 
 
     /**
-     * Perform necessary actions when login via cookie fails due bad username
-     * or bad hash.
+     * Perform necessary actions when login via cookie fails due bad username or bad hash.
      *
      * @param array $cookie_elements
      */
-    public function handleBadCookie(array $cookie_elements)
+    public function handleBadCookie(array $cookie_elements): void
     {
         // Clear authentication cookies completely
         $this->clearAuthCookie();
@@ -131,7 +133,7 @@ public function handleBadCookie(array $cookie_elements)
      *
      * @param string $username
      */
-    public function handleFailedLogin(string $username)
+    public function handleFailedLogin(string $username): void
     {
         // If currently locked-out, bail (should not happen, but better safe than sorry)
         if ($this->bl_manager->isLocked($this->remote_address, IpBlacklist\LockScope::ADMIN)) {
@@ -160,6 +162,7 @@ public function handleFailedLogin(string $username)
      *
      * @param \WP_Error|\WP_User $user
      * @param string $username
+     *
      * @return \WP_Error|\WP_User
      */
     public function lockIpIfUsernameOnBlacklist($user, string $username)
@@ -183,6 +186,7 @@ public function lockIpIfUsernameOnBlacklist($user, string $username)
      * message.
      *
      * @param \WP_Error|\WP_User $user
+     *
      * @return \WP_Error|\WP_User|null
      */
     public function muteStandardErrorMessages($user)
@@ -203,7 +207,7 @@ public function muteStandardErrorMessages($user)
      * Remove all WordPress authentication cookies if IP is on black list.
      * Method should be called as early as possible.
      */
-    public function removeAuthCookieIfIpIsLocked()
+    public function removeAuthCookieIfIpIsLocked(): void
     {
         if ($this->bl_manager->isLocked($this->remote_address, IpBlacklist\LockScope::ADMIN)) {
             $this->clearAuthCookie();
@@ -214,21 +218,15 @@ public function removeAuthCookieIfIpIsLocked()
     //// Private and protected methods
 
     /**
-     * Clear all WordPress authentication cookies (also for current session).
+     * Clear all WordPress authentication cookies (also for current request).
      */
-    protected function clearAuthCookie()
+    protected function clearAuthCookie(): void
     {
         wp_clear_auth_cookie();
 
-        if (!empty($_COOKIE[AUTH_COOKIE])) {
-            $_COOKIE[AUTH_COOKIE] = '';
-        }
-        if (!empty($_COOKIE[SECURE_AUTH_COOKIE])) {
-            $_COOKIE[SECURE_AUTH_COOKIE] = '';
-        }
-        if (!empty($_COOKIE[LOGGED_IN_COOKIE])) {
-            $_COOKIE[LOGGED_IN_COOKIE] = '';
-        }
+        unset($_COOKIE[AUTH_COOKIE]);
+        unset($_COOKIE[SECURE_AUTH_COOKIE]);
+        unset($_COOKIE[LOGGED_IN_COOKIE]);
     }
 
 
@@ -241,7 +239,7 @@ protected function clearAuthCookie()
      * @param int $duration Duration (in secs) of lockout
      * @param int $reason Lockout reason
      */
-    protected function lockOut(string $username, int $duration, int $reason)
+    protected function lockOut(string $username, int $duration, int $reason): void
     {
         // Trigger lockout action
         do_action(Hooks::LOCKOUT_EVENT, $this->remote_address, $username, $duration, $reason);
@@ -250,6 +248,6 @@ protected function lockOut(string $username, int $duration, int $reason)
         $this->bl_manager->lock($this->remote_address, $duration, IpBlacklist\LockScope::ADMIN, $reason);
 
         // Block access
-        IpBlacklist\Bouncer::blockAccessTemporarily($this->remote_address);
+        Utils::blockAccessTemporarily($this->remote_address);
     }
 }
diff --git a/classes/BlueChip/Security/Modules/Login/Settings.php b/classes/BlueChip/Security/Modules/Login/Settings.php
index a003e84..4048cda 100644
--- a/classes/BlueChip/Security/Modules/Login/Settings.php
+++ b/classes/BlueChip/Security/Modules/Login/Settings.php
@@ -7,28 +7,39 @@
  */
 class Settings extends \BlueChip\Security\Core\Settings
 {
-    /** int: Lock out for a short time after every N tries [5] */
+    /**
+     * @var string Lock out for a short time after every N tries [int:5]
+     */
     public const SHORT_LOCKOUT_AFTER = 'short_lockout_after';
 
-    /** int: Lock out for a short time for this many minutes [10] */
+    /**
+     * @var string Lock out for a short time for this many minutes [int:10]
+     */
     public const SHORT_LOCKOUT_DURATION = 'short_lockout_duration';
 
-    /** int: Lock out for a long time after every N tries [20] */
+    /**
+     * @var string Lock out for a long time after every N tries [int:20]
+     */
     public const LONG_LOCKOUT_AFTER = 'long_lockout_after';
 
-    /** int: Lock out for a long time for this many hours [24] */
+    /**
+     * @var string Lock out for a long time for this many hours [int:24]
+     */
     public const LONG_LOCKOUT_DURATION = 'long_lockout_duration';
 
-    /** int: Reset failed attempts after this many days [3] */
+    /**
+     * @var string Reset failed attempts after this many days [int:3]
+     */
     public const RESET_TIMEOUT = 'reset_timeout';
 
-    /** bool: Also limit malformed/forged cookies? [Yes] */
-    public const CHECK_COOKIES = 'check_cookies';
-
-    /** array: List of usernames that trigger long lockout immediately when used to log in [empty] */
+    /**
+     * @var string List of usernames that trigger long lockout immediately when used to log in [array:empty]
+     */
     public const USERNAME_BLACKLIST = 'username_blacklist';
 
-    /** bool: Display generic login error message? [No] */
+    /**
+     * @var string Display generic login error message? [bool:no]
+     */
     public const GENERIC_LOGIN_ERROR_MESSAGE = 'display_generic_error_message';
 
 
@@ -41,7 +52,6 @@ class Settings extends \BlueChip\Security\Core\Settings
         self::LONG_LOCKOUT_AFTER => 20,
         self::LONG_LOCKOUT_DURATION => 24,
         self::RESET_TIMEOUT => 3,
-        self::CHECK_COOKIES => true,
         self::USERNAME_BLACKLIST => [],
         self::GENERIC_LOGIN_ERROR_MESSAGE => false,
     ];
@@ -57,8 +67,9 @@ class Settings extends \BlueChip\Security\Core\Settings
     /**
      * Sanitize "username blacklist" setting. Must be list of valid usernames.
      *
-     * @param array|string $value
-     * @return array
+     * @param string|string[] $value
+     *
+     * @return string[]
      */
     public static function sanitizeUsernameBlacklist($value): array
     {
diff --git a/classes/BlueChip/Security/Modules/Notifications/AdminPage.php b/classes/BlueChip/Security/Modules/Notifications/AdminPage.php
index a24b0b3..e208ad6 100644
--- a/classes/BlueChip/Security/Modules/Notifications/AdminPage.php
+++ b/classes/BlueChip/Security/Modules/Notifications/AdminPage.php
@@ -29,7 +29,7 @@ public function __construct(Settings $settings)
     }
 
 
-    public function loadPage()
+    public function loadPage(): void
     {
         $this->displaySettingsErrors();
 
@@ -47,7 +47,7 @@ public function loadPage()
     /**
      * Output page contents.
      */
-    public function printContents()
+    public function printContents(): void
     {
         echo '<div class="wrap">';
         echo '<h1>' . esc_html($this->page_title) . '</h1>';
@@ -59,7 +59,7 @@ public function printContents()
     /**
      * Initialize settings page: add sections and fields.
      */
-    public function initPage()
+    public function initPage(): void
     {
         // Register settings.
         $this->registerSettings();
diff --git a/classes/BlueChip/Security/Modules/Notifications/Mailman.php b/classes/BlueChip/Security/Modules/Notifications/Mailman.php
index 0edc284..b86acb5 100644
--- a/classes/BlueChip/Security/Modules/Notifications/Mailman.php
+++ b/classes/BlueChip/Security/Modules/Notifications/Mailman.php
@@ -24,9 +24,10 @@ abstract class Mailman
      *
      * @see wp_mail()
      *
-     * @param array|string $to Email address(es) of notification recipient(s).
+     * @param string|string[] $to Email address(es) of notification recipient(s).
      * @param string $subject Subject of notification.
-     * @param array|string $message Body of notification.
+     * @param string|string[] $message Body of notification.
+     *
      * @return bool True if notification has been sent successfully, false otherwise.
      */
     public static function send($to, string $subject, $message): bool
@@ -42,16 +43,18 @@ public static function send($to, string $subject, $message): bool
     /**
      * Strip any HTML tags from $message and add plugin boilerplate to it.
      *
-     * @param array $message Message body as list of lines.
+     * @param string[] $message Message body as list of lines.
+     *
      * @return string
      */
     private static function formatMessage(array $message): string
     {
         $boilerplate_intro = [
             \sprintf(
-                __('This email was sent from your website "%1$s" by BC Security plugin on %2$s at %3$s.'),
+                __('This email was sent from your website "%1$s" (%2$s) by BC Security plugin on %3$s at %4$s.'),
                 // Blog name must be decoded, see: https://github.com/chesio/bc-security/issues/86
                 wp_specialchars_decode(get_option('blogname'), ENT_QUOTES),
+                get_home_url(),
                 wp_date(get_option('date_format')),
                 wp_date(get_option('time_format'))
             ),
@@ -74,6 +77,7 @@ private static function formatMessage(array $message): string
      * Prepare subject for email (prepend site name and "BC Security Alert").
      *
      * @param string $subject
+     *
      * @return string
      */
     private static function formatSubject(string $subject): string
@@ -99,8 +103,9 @@ private static function formatSubject(string $subject): string
      * [1] https://www.example.com
      * [2] https://www.one-more-example.com/
      *
-     * @param array $message Message as list of strings with HTML tags.
-     * @return array Message as list of strings without HTML tags with optional URL index appended.
+     * @param string[] $message Message as list of strings with HTML tags.
+     *
+     * @return string[] Message as list of strings without HTML tags with optional URL index appended.
      */
     private static function stripTags(array $message): array
     {
diff --git a/classes/BlueChip/Security/Modules/Notifications/Settings.php b/classes/BlueChip/Security/Modules/Notifications/Settings.php
index 10e1dc0..7f5d1e9 100644
--- a/classes/BlueChip/Security/Modules/Notifications/Settings.php
+++ b/classes/BlueChip/Security/Modules/Notifications/Settings.php
@@ -7,31 +7,49 @@
  */
 class Settings extends \BlueChip\Security\Core\Settings
 {
-    /** bool: Notify when user with admin privileges logs in [Yes] */
+    /**
+     * @var string Notify when user with admin privileges logs in [bool:yes]
+     */
     public const ADMIN_USER_LOGIN = 'admin_user_login';
 
-    /** bool: Notify when known IP (IP for which there is a successful login in logs) is locked out [Yes] */
+    /**
+     * @var string Notify when known IP (IP for which there is a successful login in logs) is locked out [bool:yes]
+     */
     public const KNOWN_IP_LOCKOUT = 'known_ip_lockout';
 
-    /** bool: Notify when there is an update for WordPress available [Yes] */
+    /**
+     * @var string Notify when there is an update for WordPress available [bool:yes]
+     */
     public const CORE_UPDATE_AVAILABLE = 'core_update_available';
 
-    /** bool: Notify when there is a plugin update available [Yes] */
+    /**
+     * @var string Notify when there is a plugin update available [bool:yes]
+     */
     public const PLUGIN_UPDATE_AVAILABLE = 'plugin_update_available';
 
-    /** bool: Notify when there is a theme update available [Yes] */
+    /**
+     * @var string Notify when there is a theme update available [bool:yes]
+     */
     public const THEME_UPDATE_AVAILABLE = 'theme_update_available';
 
-    /** bool: Notify when automatic checklist check triggers an alert [Yes] */
+    /**
+     * @var string Notify when automatic checklist check triggers an alert [bool:yes]
+     */
     public const CHECKLIST_ALERT = 'checklist_alert';
 
-    /** bool: Notify when BC Security is deactivated [Yes] */
+    /**
+     * @var string Notify when BC Security is deactivated [bool:yes]
+     */
     public const PLUGIN_DEACTIVATED = 'plugin_deactivated';
 
-    /** bool: Send notification to email address of site administrator [No] */
+    /**
+     * @var string Send notification to email address of site administrator [bool:no]
+     */
     public const NOTIFY_SITE_ADMIN = 'notify_site_admin';
 
-    /** array: List of email addresses of any additional notifications [empty] */
+    /**
+     * @var string List of email addresses of any additional notifications [array:empty]
+     */
     public const NOTIFICATION_RECIPIENTS = 'notification_recipients';
 
     /**
@@ -60,8 +78,9 @@ class Settings extends \BlueChip\Security\Core\Settings
     /**
      * Sanitize "notification recipients" setting. Must be list of emails.
      *
-     * @param array|string $value
-     * @return array
+     * @param string|string[] $value
+     *
+     * @return string[]
      */
     public static function sanitizeNotificationRecipient($value): array
     {
diff --git a/classes/BlueChip/Security/Modules/Notifications/Watchman.php b/classes/BlueChip/Security/Modules/Notifications/Watchman.php
index badca0e..a296b35 100644
--- a/classes/BlueChip/Security/Modules/Notifications/Watchman.php
+++ b/classes/BlueChip/Security/Modules/Notifications/Watchman.php
@@ -28,7 +28,7 @@ class Watchman implements Modules\Initializable, Modules\Activable
     private $logger;
 
     /**
-     * @var array List of notifications recipients
+     * @var string[] List of notifications recipients
      */
     private $recipients;
 
@@ -66,6 +66,7 @@ public static function isMuted(): bool
      * Format remote IP address - append result of reverse DNS lookup if successful.
      *
      * @param string $remote_address
+     *
      * @return string
      */
     private static function formatRemoteAddress(string $remote_address): string
@@ -82,7 +83,7 @@ private static function formatRemoteAddress(string $remote_address): string
     /**
      * Initialize notification according to settings.
      */
-    public function init()
+    public function init(): void
     {
         // Bail early if no recipients are set or we are explicitly ordered to not disturb.
         if (empty($this->recipients) || self::isMuted()) {
@@ -111,7 +112,7 @@ public function init()
     }
 
 
-    public function activate()
+    public function activate(): void
     {
         // Do nothing.
     }
@@ -120,7 +121,7 @@ public function activate()
     /**
      * Send notification that plugin has been deactivated.
      */
-    public function deactivate()
+    public function deactivate(): void
     {
         // Bail early if no recipients are set.
         if (empty($this->recipients)) {
@@ -156,7 +157,7 @@ public function deactivate()
      *
      * @param object $update_transient
      */
-    public function watchCoreUpdateAvailable($update_transient)
+    public function watchCoreUpdateAvailable($update_transient): void
     {
         // Check if update transient has the data we are interested in.
         if (!isset($update_transient->updates) || !\is_array($update_transient->updates) || empty($update_transient->updates)) {
@@ -200,7 +201,7 @@ public function watchCoreUpdateAvailable($update_transient)
      *
      * @param object $update_transient
      */
-    public function watchPluginUpdatesAvailable($update_transient)
+    public function watchPluginUpdatesAvailable($update_transient): void
     {
         // Check if update transient has the data we are interested in.
         if (!isset($update_transient->response) || !\is_array($update_transient->response)) {
@@ -257,7 +258,7 @@ public function watchPluginUpdatesAvailable($update_transient)
      *
      * @param object $update_transient
      */
-    public function watchThemeUpdatesAvailable($update_transient)
+    public function watchThemeUpdatesAvailable($update_transient): void
     {
         // Check if update transient has the data we are interested in.
         if (!isset($update_transient->response) || !\is_array($update_transient->response)) {
@@ -306,7 +307,7 @@ public function watchThemeUpdatesAvailable($update_transient)
      * @param string $username
      * @param int $duration
      */
-    public function watchLockoutEvents(string $remote_address, string $username, int $duration)
+    public function watchLockoutEvents(string $remote_address, string $username, int $duration): void
     {
         if (\in_array($remote_address, $this->logger->getKnownIps(), true)) {
             $subject = __('Known IP locked out', 'bc-security');
@@ -328,7 +329,7 @@ public function watchLockoutEvents(string $remote_address, string $username, int
      * @param string $username
      * @param \WP_User $user
      */
-    public function watchWpLogin(string $username, \WP_User $user)
+    public function watchWpLogin(string $username, \WP_User $user): void
     {
         if (Is::admin($user)) {
             $subject = __('Admin user login', 'bc-security');
@@ -349,7 +350,7 @@ public function watchWpLogin(string $username, \WP_User $user)
      * @param \BlueChip\Security\Modules\Checklist\Check $check
      * @param \BlueChip\Security\Modules\Checklist\CheckResult $result
      */
-    public function watchChecklistSingleCheckAlert(Checklist\Check $check, Checklist\CheckResult $result)
+    public function watchChecklistSingleCheckAlert(Checklist\Check $check, Checklist\CheckResult $result): void
     {
         $subject = __('Checklist monitoring alert', 'bc-security');
         $preamble = [
@@ -366,7 +367,7 @@ public function watchChecklistSingleCheckAlert(Checklist\Check $check, Checklist
      *
      * @param array $issues Issues which triggered the alert (issue is an array with 'check' and 'result' keys).
      */
-    public function watchChecklistMultipleChecksAlert(array $issues)
+    public function watchChecklistMultipleChecksAlert(array $issues): void
     {
         $subject = __('Checklist monitoring alert', 'bc-security');
         $message = [
@@ -386,7 +387,8 @@ public function watchChecklistMultipleChecksAlert(array $issues)
      * Send email notification with given $subject and $message to recipients configured in plugin settings.
      *
      * @param string $subject
-     * @param array|string $message
+     * @param string|string[] $message
+     *
      * @return bool|null Null if there are no recipients configured. True if email has been sent, false otherwise.
      */
     private function notify(string $subject, $message): ?bool
diff --git a/classes/BlueChip/Security/Modules/Services/ReverseDnsLookup/Resolver.php b/classes/BlueChip/Security/Modules/Services/ReverseDnsLookup/Resolver.php
index 8aabcb9..6d078c6 100644
--- a/classes/BlueChip/Security/Modules/Services/ReverseDnsLookup/Resolver.php
+++ b/classes/BlueChip/Security/Modules/Services/ReverseDnsLookup/Resolver.php
@@ -26,20 +26,20 @@ class Resolver implements Modules\Activable, Modules\Initializable
     private const CACHE_TTL = DAY_IN_SECONDS;
 
 
-    public function activate()
+    public function activate(): void
     {
         // Do nothing.
     }
 
 
-    public function deactivate()
+    public function deactivate(): void
     {
         // Unschedule all cron jobs consumed by this module.
         wp_unschedule_hook(self::RESOLVE_REMOTE_ADDRESS);
     }
 
 
-    public function init()
+    public function init(): void
     {
         // Register action for non-blocking hostname resolution.
         add_action(self::RESOLVE_REMOTE_ADDRESS, [$this, 'resolveHostname'], 10, 3);
@@ -55,7 +55,7 @@ public function init()
      * @param string $action Name of action to invoke with resolved hostname.
      * @param array $context Additional parameters that are passed to the action.
      */
-    public function resolveHostname(string $ip_address, string $action, array $context)
+    public function resolveHostname(string $ip_address, string $action, array $context): void
     {
         if (!empty($hostname = $this->resolveHostnameInForeground($ip_address))) {
             do_action($action, new Response($ip_address, $hostname, $context));
@@ -72,7 +72,7 @@ public function resolveHostname(string $ip_address, string $action, array $conte
      * @param string $action Name of action to call when remote hostname is resolved.
      * @param array $context [optional] Additional parameters to pass to the action.
      */
-    public function resolveHostnameInBackground(string $ip_address, string $action, array $context = [])
+    public function resolveHostnameInBackground(string $ip_address, string $action, array $context = []): void
     {
         wp_schedule_single_event(\time(), self::RESOLVE_REMOTE_ADDRESS, [$ip_address, $action, $context]);
     }
@@ -82,6 +82,7 @@ public function resolveHostnameInBackground(string $ip_address, string $action,
      * Get hostname for remote IP address in blocking way.
      *
      * @param string $ip_address Remote IP address to resolve.
+     *
      * @return string Remote hostname on success, IP address if hostname could not be resolved, empty string on failure.
      */
     public function resolveHostnameInForeground(string $ip_address): string
diff --git a/classes/BlueChip/Security/Modules/Tools/AdminPage.php b/classes/BlueChip/Security/Modules/Tools/AdminPage.php
index 7a607c9..bdf4e09 100644
--- a/classes/BlueChip/Security/Modules/Tools/AdminPage.php
+++ b/classes/BlueChip/Security/Modules/Tools/AdminPage.php
@@ -3,6 +3,7 @@
 namespace BlueChip\Security\Modules\Tools;
 
 use BlueChip\Security\Helpers\AdminNotices;
+use BlueChip\Security\Settings;
 use BlueChip\Security\Setup;
 
 class AdminPage extends \BlueChip\Security\Core\Admin\AbstractPage
@@ -29,15 +30,15 @@ class AdminPage extends \BlueChip\Security\Core\Admin\AbstractPage
 
 
     /**
-     * @var \BlueChip\Security\Core\Settings[] Plugin settings collection
+     * @var \BlueChip\Security\Settings Plugin settings object
      */
-    private $settings = [];
+    private $settings;
 
 
     /**
-     * @param \BlueChip\Security\Core\Settings[] $settings Plugin settings collection
+     * @param \BlueChip\Security\Settings $settings Plugin settings object
      */
-    public function __construct(array $settings)
+    public function __construct(Settings $settings)
     {
         $this->page_title = _x('Tools', 'Dashboard page title', 'bc-security');
         $this->menu_title = _x('Tools', 'Dashboard menu item name', 'bc-security');
@@ -46,13 +47,13 @@ public function __construct(array $settings)
     }
 
 
-    public function loadPage()
+    public function loadPage(): void
     {
         $this->processActions();
     }
 
 
-    public function printContents()
+    public function printContents(): void
     {
         echo '<div class="wrap">';
         echo '<h1>' . esc_html($this->page_title) . '</h1>';
@@ -67,7 +68,7 @@ public function printContents()
     }
 
 
-    private function printExportForm()
+    private function printExportForm(): void
     {
         echo '<h2>' . esc_html__('Export settings', 'bc-security') . '</h2>';
         echo '<p>' . esc_html__('Create JSON file with plugin settings that can be used as backup or to clone the settings to another installation.', 'bc-security') . '</p>';
@@ -80,7 +81,7 @@ private function printExportForm()
     }
 
 
-    private function printImportForm()
+    private function printImportForm(): void
     {
         echo '<h2>' . esc_html__('Import settings', 'bc-security') . '</h2>';
         echo '<p>' . esc_html__('Import only JSON files created with the same version of the plugin!', 'bc-security') . '</p>';
@@ -96,7 +97,7 @@ private function printImportForm()
     }
 
 
-    private function printResetForm()
+    private function printResetForm(): void
     {
         echo '<h2>' . esc_html__('Reset settings', 'bc-security') . '</h2>';
         echo '<p>';
@@ -122,7 +123,7 @@ private function printResetForm()
     /**
      * Dispatch any action that is indicated by POST data (form submission).
      */
-    private function processActions()
+    private function processActions(): void
     {
         $nonce = \filter_input(INPUT_POST, self::NONCE_NAME, FILTER_SANITIZE_STRING);
         if (empty($nonce)) {
@@ -147,7 +148,7 @@ private function processActions()
     }
 
 
-    private function processExportAction()
+    private function processExportAction(): void
     {
         $export = [];
 
@@ -166,7 +167,7 @@ private function processExportAction()
     }
 
 
-    private function processImportAction()
+    private function processImportAction(): void
     {
         $import_file = $_FILES['import-file'];
 
@@ -228,7 +229,7 @@ private function processImportAction()
     }
 
 
-    private function processResetAction()
+    private function processResetAction(): void
     {
         foreach ($this->settings as $settings) {
             $settings->reset();
diff --git a/classes/BlueChip/Security/Plugin.php b/classes/BlueChip/Security/Plugin.php
index 6e9a95a..a0fa611 100644
--- a/classes/BlueChip/Security/Plugin.php
+++ b/classes/BlueChip/Security/Plugin.php
@@ -13,7 +13,7 @@ class Plugin
     private $modules;
 
     /**
-     * @var \BlueChip\Security\Core\Settings[] Plugin setting objects
+     * @var Settings Plugin settings object
      */
     private $settings;
 
@@ -22,6 +22,11 @@ class Plugin
      */
     private $plugin_filename;
 
+    /**
+     * @var string Remote address
+     */
+    private $remote_address;
+
     /**
      * @var \wpdb WordPress database access abstraction object
      */
@@ -40,32 +45,16 @@ public function __construct(string $plugin_filename, \wpdb $wpdb)
         $this->wpdb = $wpdb;
 
         // Read plugin settings.
-        $this->settings = $settings = self::constructSettings();
+        $this->settings = $settings = new Settings();
 
         // Get setup info.
-        $setup = new Setup\Core($settings['setup']);
-
-        // Construct modules.
-        $this->modules = self::constructModules($wpdb, $setup->getRemoteAddress(), $setup->getServerAddress(), $settings);
-    }
+        $setup = new Setup\Core($settings->forSetup());
 
+        // Get remote address.
+        $this->remote_address = $setup->getRemoteAddress();
 
-    /**
-     * Construct plugin settings.
-     *
-     * @return array
-     */
-    private static function constructSettings(): array
-    {
-        return [
-            'cron-jobs'         => new Modules\Cron\Settings('bc-security-cron-jobs'),
-            'checklist-autorun' => new Modules\Checklist\AutorunSettings('bc-security-checklist-autorun'),
-            'hardening'         => new Modules\Hardening\Settings('bc-security-hardening'),
-            'log'               => new Modules\Log\Settings('bc-security-log'),
-            'login'             => new Modules\Login\Settings('bc-security-login'),
-            'notifications'     => new Modules\Notifications\Settings('bc-security-notifications'),
-            'setup'             => new Setup\Settings('bc-security-setup'),
-        ];
+        // Construct modules.
+        $this->modules = self::constructModules($wpdb, $this->remote_address, $setup->getServerAddress(), $settings);
     }
 
 
@@ -75,24 +64,25 @@ private static function constructSettings(): array
      * @param \wpdb $wpdb
      * @param string $remote_address
      * @param string $server_address
-     * @param array $settings
+     * @param Settings $settings
+     *
      * @return array
      */
-    private static function constructModules(\wpdb $wpdb, string $remote_address, string $server_address, array $settings): array
+    private static function constructModules(\wpdb $wpdb, string $remote_address, string $server_address, Settings $settings): array
     {
-        $google_api = new Setup\GoogleAPI($settings['setup']);
+        $google_api = new Setup\GoogleAPI($settings->forSetup());
 
         $hostname_resolver  = new Modules\Services\ReverseDnsLookup\Resolver();
-        $cron_job_manager   = new Modules\Cron\Manager($settings['cron-jobs']);
-        $logger             = new Modules\Log\Logger($wpdb, $remote_address, $settings['log'], $hostname_resolver);
-        $checklist_manager  = new Modules\Checklist\Manager($settings['checklist-autorun'], $cron_job_manager, $wpdb, $google_api->getKey());
+        $cron_job_manager   = new Modules\Cron\Manager($settings->forCronJobs());
+        $logger             = new Modules\Log\Logger($wpdb, $remote_address, $settings->forLog(), $hostname_resolver);
+        $checklist_manager  = new Modules\Checklist\Manager($settings->forChecklistAutorun(), $cron_job_manager, $wpdb, $google_api->getKey());
         $monitor            = new Modules\Log\EventsMonitor($remote_address, $server_address);
-        $notifier           = new Modules\Notifications\Watchman($settings['notifications'], $remote_address, $logger);
-        $hardening          = new Modules\Hardening\Core($settings['hardening']);
+        $notifier           = new Modules\Notifications\Watchman($settings->forNotifications(), $remote_address, $logger);
+        $hardening          = new Modules\Hardening\Core($settings->forHardening());
         $blacklist_manager  = new Modules\IpBlacklist\Manager($wpdb);
         $blacklist_bouncer  = new Modules\IpBlacklist\Bouncer($remote_address, $blacklist_manager);
-        $bookkeeper         = new Modules\Login\Bookkeeper($settings['login'], $wpdb);
-        $gatekeeper         = new Modules\Login\Gatekeeper($settings['login'], $remote_address, $bookkeeper, $blacklist_manager);
+        $bookkeeper         = new Modules\Login\Bookkeeper($settings->forLogin(), $wpdb);
+        $gatekeeper         = new Modules\Login\Gatekeeper($settings->forLogin(), $remote_address, $bookkeeper, $blacklist_manager);
 
         return [
             'cron-job-manager'  => $cron_job_manager,
@@ -112,10 +102,17 @@ private static function constructModules(\wpdb $wpdb, string $remote_address, st
 
     /**
      * Load the plugin by hooking into WordPress actions and filters.
-     * Method should be invoked immediately on plugin load.
+     *
+     * @action https://developer.wordpress.org/reference/hooks/plugins_loaded/
      */
-    public function load()
+    public function load(): void
     {
+        // Plugin functionality relies heavily on knowledge of remote address,
+        // so die immediately if remote address is unknown (except in case of cli context).
+        if (($this->remote_address === '') && !Helpers\Is::cli()) {
+            Helpers\Utils::blockAccessTemporarily();
+        }
+
         // Load all modules that require immediate loading.
         foreach ($this->modules as $module) {
             if ($module instanceof Modules\Loadable) {
@@ -123,8 +120,12 @@ public function load()
             }
         }
 
-        // Register initialization method.
-        add_action('init', [$this, 'init'], 10, 0);
+        // Run initialization if `init` hook has been fired already, otherwise just hook the init method to it.
+        if (did_action('init')) {
+            $this->init();
+        } else {
+            add_action('init', [$this, 'init'], 10, 0);
+        }
     }
 
 
@@ -134,7 +135,7 @@ public function load()
      *
      * @action https://developer.wordpress.org/reference/hooks/init/
      */
-    public function init()
+    public function init(): void
     {
         // Initialize all modules that require initialization.
         foreach ($this->modules as $module) {
@@ -150,29 +151,29 @@ public function init()
             (new Admin())->init($this->plugin_filename)
                 // Setup comes first...
                 ->addPage(new Setup\AdminPage(
-                    $this->settings['setup']
+                    $this->settings->forSetup()
                 ))
                 // ...then come admin pages.
                 ->addPage(new Modules\Checklist\AdminPage(
                     $this->modules['checklist-manager'],
-                    $this->settings['checklist-autorun'],
+                    $this->settings->forChecklistAutorun(),
                     $assets_manager
                 ))
                 ->addPage(new Modules\Hardening\AdminPage(
-                    $this->settings['hardening']
+                    $this->settings->forHardening()
                 ))
                 ->addPage(new Modules\Login\AdminPage(
-                    $this->settings['login']
+                    $this->settings->forLogin()
                 ))
                 ->addPage(new Modules\IpBlacklist\AdminPage(
                     $this->modules['blacklist-manager'],
                     $this->modules['cron-job-manager']
                 ))
                 ->addPage(new Modules\Notifications\AdminPage(
-                    $this->settings['notifications']
+                    $this->settings->forNotifications()
                 ))
                 ->addPage(new Modules\Log\AdminPage(
-                    $this->settings['log'],
+                    $this->settings->forLog(),
                     $this->modules['logger']
                 ))
                 ->addPage(new Modules\Tools\AdminPage($this->settings))
@@ -187,7 +188,7 @@ public function init()
      *
      * @link https://developer.wordpress.org/plugins/the-basics/activation-deactivation-hooks/
      */
-    public function activate()
+    public function activate(): void
     {
         // Explicitly persist every setting object, so related option is autoloaded.
         foreach ($this->settings as $settings) {
@@ -216,7 +217,7 @@ public function activate()
      *
      * @link https://developer.wordpress.org/plugins/the-basics/activation-deactivation-hooks/
      */
-    public function deactivate()
+    public function deactivate(): void
     {
         // Deactivate every module that requires it.
         foreach ($this->modules as $module) {
@@ -233,7 +234,7 @@ public function deactivate()
      *
      * @link https://developer.wordpress.org/plugins/the-basics/uninstall-methods/
      */
-    public function uninstall()
+    public function uninstall(): void
     {
         // Remove plugin settings.
         foreach ($this->settings as $settings) {
diff --git a/classes/BlueChip/Security/Settings.php b/classes/BlueChip/Security/Settings.php
new file mode 100644
index 0000000..3ca5b6e
--- /dev/null
+++ b/classes/BlueChip/Security/Settings.php
@@ -0,0 +1,96 @@
+<?php
+
+namespace BlueChip\Security;
+
+/**
+ * Object that provides access to all plugin settings
+ */
+class Settings implements \IteratorAggregate
+{
+    /**
+     * @var Modules\Checklist\AutorunSettings;
+     */
+    private $checklist_autorun;
+
+    /**
+     * @var Modules\Cron\Settings
+     */
+    private $cron_jobs;
+
+    /**
+     * @var Modules\Hardening\Settings
+     */
+    private $hardening;
+
+    /**
+     * @var Modules\Log\Settings
+     */
+    private $log;
+
+    /**
+     * @var Modules\Login\Settings
+     */
+    private $login;
+
+    /**
+     * @var Modules\Notifications\Settings
+     */
+    private $notifications;
+
+    /**
+     * @var Setup\Settings
+     */
+    private $setup;
+
+
+    public function __construct()
+    {
+        $this->checklist_autorun    = new Modules\Checklist\AutorunSettings('bc-security-checklist-autorun');
+        $this->cron_jobs            = new Modules\Cron\Settings('bc-security-cron-jobs');
+        $this->hardening            = new Modules\Hardening\Settings('bc-security-hardening');
+        $this->log                  = new Modules\Log\Settings('bc-security-log');
+        $this->login                = new Modules\Login\Settings('bc-security-login');
+        $this->notifications        = new Modules\Notifications\Settings('bc-security-notifications');
+        $this->setup                = new Setup\Settings('bc-security-setup');
+    }
+
+    public function getIterator(): \Traversable
+    {
+        return new \ArrayIterator((array) $this);
+    }
+
+    public function forChecklistAutorun(): Modules\Checklist\AutorunSettings
+    {
+        return $this->checklist_autorun;
+    }
+
+    public function forCronJobs(): Modules\Cron\Settings
+    {
+        return $this->cron_jobs;
+    }
+
+    public function forHardening(): Modules\Hardening\Settings
+    {
+        return $this->hardening;
+    }
+
+    public function forLog(): Modules\Log\Settings
+    {
+        return $this->log;
+    }
+
+    public function forLogin(): Modules\Login\Settings
+    {
+        return $this->login;
+    }
+
+    public function forNotifications(): Modules\Notifications\Settings
+    {
+        return $this->notifications;
+    }
+
+    public function forSetup(): Setup\Settings
+    {
+        return $this->setup;
+    }
+}
diff --git a/classes/BlueChip/Security/Setup/AdminPage.php b/classes/BlueChip/Security/Setup/AdminPage.php
index f146b9a..17be67f 100644
--- a/classes/BlueChip/Security/Setup/AdminPage.php
+++ b/classes/BlueChip/Security/Setup/AdminPage.php
@@ -29,7 +29,7 @@ public function __construct(Settings $settings)
     }
 
 
-    public function loadPage()
+    public function loadPage(): void
     {
         $this->displaySettingsErrors();
 
@@ -64,7 +64,7 @@ public function loadPage()
     /**
      * Output page contents.
      */
-    public function printContents()
+    public function printContents(): void
     {
         echo '<div class="wrap">';
         echo '<h1>' . esc_html($this->page_title) . '</h1>';
@@ -76,7 +76,7 @@ public function printContents()
     /**
      * Initialize settings page: add sections and fields.
      */
-    public function initPage()
+    public function initPage(): void
     {
         // Register settings.
         $this->registerSettings();
@@ -111,7 +111,7 @@ public function initPage()
     }
 
 
-    public function printGoogleAPIHint()
+    public function printGoogleAPIHint(): void
     {
         echo '<p>';
         echo sprintf(
@@ -124,16 +124,14 @@ public function printGoogleAPIHint()
     }
 
 
-    public function printSiteConnectionHint()
+    public function printSiteConnectionHint(): void
     {
-        $list = IpAddress::enlist(true);
-
         echo '<p>';
         echo esc_html__('Your server provides following information about remote addresses:', 'bc-security');
         echo '</p>';
 
         echo '<ol>';
-        foreach ($list as $type => $explanation) {
+        foreach (IpAddress::enlist() as $type => $explanation) {
             if (($ip_address = IpAddress::getRaw($type))) {
                 echo '<li>' . \sprintf('%s: <code>$_SERVER[<strong>%s</strong>] = <em>%s</em></code>', esc_html($explanation), $type, $ip_address) . '</li>';
             }
@@ -149,9 +147,8 @@ public function printSiteConnectionHint()
      */
     private function getConnectionOptions(): array
     {
-        $list = IpAddress::enlist(true);
         $options = [];
-        foreach ($list as $type => $explanation) {
+        foreach (IpAddress::enlist() as $type => $explanation) {
             $options[$type] = \sprintf('%s: %s', $type, $explanation);
         }
         return $options;
diff --git a/classes/BlueChip/Security/Setup/IpAddress.php b/classes/BlueChip/Security/Setup/IpAddress.php
index fb4521f..3a95948 100644
--- a/classes/BlueChip/Security/Setup/IpAddress.php
+++ b/classes/BlueChip/Security/Setup/IpAddress.php
@@ -25,19 +25,16 @@ abstract class IpAddress
     /**
      * Get a list of all connection types supported by the plugin.
      *
-     * @param bool $explain Return array with type as key and explanation as value.
      * @return array Array of known (valid) connection types.
      */
-    public static function enlist(bool $explain = false): array
+    public static function enlist(): array
     {
-        $list = [
+        return [
             self::REMOTE_ADDR => __('Direct connection to the Internet', 'bc-security'),
             self::HTTP_CF_CONNECTING_IP => __('Behind CloudFlare CDN and reverse proxy', 'bc-security'),
             self::HTTP_X_FORWARDED_FOR => __('Behind a reverse proxy or load balancer', 'bc-security'),
             self::HTTP_X_REAL_IP => __('Behind a reverse proxy or load balancer', 'bc-security'),
         ];
-
-        return $explain ? $list : \array_keys($list);
     }
 
 
@@ -45,11 +42,12 @@ public static function enlist(bool $explain = false): array
      * Get remote address according to provided $type (with fallback to REMOTE_ADDR).
      *
      * @param string $type
+     *
      * @return string Remote IP or empty string if remote IP could not been determined.
      */
     public static function get(string $type): string
     {
-        if (!\in_array($type, self::enlist(), true)) {
+        if (!\array_key_exists($type, self::enlist())) {
             // Invalid type, fall back to direct address.
             $type = self::REMOTE_ADDR;
         }
@@ -77,11 +75,12 @@ public static function get(string $type): string
      * Get raw $_SERVER value for connection $type.
      *
      * @param string $type
+     *
      * @return string
      */
     public static function getRaw(string $type): string
     {
-        return (\in_array($type, self::enlist(), true) && isset($_SERVER[$type])) ? $_SERVER[$type] : '';
+        return \array_key_exists($type, self::enlist()) ? ($_SERVER[$type] ?? '') : '';
     }
 
 
@@ -100,6 +99,7 @@ public static function getServer(): string
      * Get the first from possibly multiple $ip_addresses.
      *
      * @param string $ip_addresses
+     *
      * @return string
      */
     private static function getFirst(string $ip_addresses): string
diff --git a/classes/BlueChip/Security/Setup/Settings.php b/classes/BlueChip/Security/Setup/Settings.php
index 57a6647..b09257d 100644
--- a/classes/BlueChip/Security/Setup/Settings.php
+++ b/classes/BlueChip/Security/Setup/Settings.php
@@ -7,10 +7,14 @@
  */
 class Settings extends \BlueChip\Security\Core\Settings
 {
-    /** string: What is server connection type? [REMOTE_ADDR] */
+    /**
+     * @var string What is server connection type? [string:REMOTE_ADDR]
+     */
     public const CONNECTION_TYPE = 'connection-type';
 
-    /** string: Google API key (for Safe Browsing check) */
+    /**
+     * @var string Google API key (for Safe Browsing check) [string]
+     */
     public const GOOGLE_API_KEY = 'google-api-key';
 
 
@@ -35,10 +39,11 @@ class Settings extends \BlueChip\Security\Core\Settings
      *
      * @param string $value
      * @param string $default
+     *
      * @return string
      */
     public static function sanitizeConnectionType(string $value, string $default): string
     {
-        return \in_array($value, IpAddress::enlist(), true) ? $value : $default;
+        return \array_key_exists($value, IpAddress::enlist()) ? $value : $default;
     }
 }
diff --git a/classes/Psr/Log/AbstractLogger.php b/classes/Psr/Log/AbstractLogger.php
index 90e721a..6fe7505 100644
--- a/classes/Psr/Log/AbstractLogger.php
+++ b/classes/Psr/Log/AbstractLogger.php
@@ -19,7 +19,7 @@ abstract class AbstractLogger implements LoggerInterface
      *
      * @return void
      */
-    public function emergency($message, array $context = array())
+    public function emergency($message, array $context = [])
     {
         $this->log(LogLevel::EMERGENCY, $message, $context);
     }
@@ -35,7 +35,7 @@ public function emergency($message, array $context = array())
      *
      * @return void
      */
-    public function alert($message, array $context = array())
+    public function alert($message, array $context = [])
     {
         $this->log(LogLevel::ALERT, $message, $context);
     }
@@ -50,7 +50,7 @@ public function alert($message, array $context = array())
      *
      * @return void
      */
-    public function critical($message, array $context = array())
+    public function critical($message, array $context = [])
     {
         $this->log(LogLevel::CRITICAL, $message, $context);
     }
@@ -64,7 +64,7 @@ public function critical($message, array $context = array())
      *
      * @return void
      */
-    public function error($message, array $context = array())
+    public function error($message, array $context = [])
     {
         $this->log(LogLevel::ERROR, $message, $context);
     }
@@ -80,7 +80,7 @@ public function error($message, array $context = array())
      *
      * @return void
      */
-    public function warning($message, array $context = array())
+    public function warning($message, array $context = [])
     {
         $this->log(LogLevel::WARNING, $message, $context);
     }
@@ -93,7 +93,7 @@ public function warning($message, array $context = array())
      *
      * @return void
      */
-    public function notice($message, array $context = array())
+    public function notice($message, array $context = [])
     {
         $this->log(LogLevel::NOTICE, $message, $context);
     }
@@ -108,7 +108,7 @@ public function notice($message, array $context = array())
      *
      * @return void
      */
-    public function info($message, array $context = array())
+    public function info($message, array $context = [])
     {
         $this->log(LogLevel::INFO, $message, $context);
     }
@@ -121,7 +121,7 @@ public function info($message, array $context = array())
      *
      * @return void
      */
-    public function debug($message, array $context = array())
+    public function debug($message, array $context = [])
     {
         $this->log(LogLevel::DEBUG, $message, $context);
     }
diff --git a/classes/Psr/Log/LoggerInterface.php b/classes/Psr/Log/LoggerInterface.php
index 5ea7243..019c2a8 100644
--- a/classes/Psr/Log/LoggerInterface.php
+++ b/classes/Psr/Log/LoggerInterface.php
@@ -27,7 +27,7 @@ interface LoggerInterface
      *
      * @return void
      */
-    public function emergency($message, array $context = array());
+    public function emergency($message, array $context = []);
 
     /**
      * Action must be taken immediately.
@@ -40,7 +40,7 @@ public function emergency($message, array $context = array());
      *
      * @return void
      */
-    public function alert($message, array $context = array());
+    public function alert($message, array $context = []);
 
     /**
      * Critical conditions.
@@ -52,7 +52,7 @@ public function alert($message, array $context = array());
      *
      * @return void
      */
-    public function critical($message, array $context = array());
+    public function critical($message, array $context = []);
 
     /**
      * Runtime errors that do not require immediate action but should typically
@@ -63,7 +63,7 @@ public function critical($message, array $context = array());
      *
      * @return void
      */
-    public function error($message, array $context = array());
+    public function error($message, array $context = []);
 
     /**
      * Exceptional occurrences that are not errors.
@@ -76,7 +76,7 @@ public function error($message, array $context = array());
      *
      * @return void
      */
-    public function warning($message, array $context = array());
+    public function warning($message, array $context = []);
 
     /**
      * Normal but significant events.
@@ -86,7 +86,7 @@ public function warning($message, array $context = array());
      *
      * @return void
      */
-    public function notice($message, array $context = array());
+    public function notice($message, array $context = []);
 
     /**
      * Interesting events.
@@ -98,7 +98,7 @@ public function notice($message, array $context = array());
      *
      * @return void
      */
-    public function info($message, array $context = array());
+    public function info($message, array $context = []);
 
     /**
      * Detailed debug information.
@@ -108,7 +108,7 @@ public function info($message, array $context = array());
      *
      * @return void
      */
-    public function debug($message, array $context = array());
+    public function debug($message, array $context = []);
 
     /**
      * Logs with an arbitrary level.
@@ -119,5 +119,5 @@ public function debug($message, array $context = array());
      *
      * @return void
      */
-    public function log($level, $message, array $context = array());
+    public function log($level, $message, array $context = []);
 }
diff --git a/classes/Psr/Log/LoggerTrait.php b/classes/Psr/Log/LoggerTrait.php
index 867225d..5bc74dc 100644
--- a/classes/Psr/Log/LoggerTrait.php
+++ b/classes/Psr/Log/LoggerTrait.php
@@ -20,7 +20,7 @@ trait LoggerTrait
      *
      * @return void
      */
-    public function emergency($message, array $context = array())
+    public function emergency($message, array $context = [])
     {
         $this->log(LogLevel::EMERGENCY, $message, $context);
     }
@@ -36,7 +36,7 @@ public function emergency($message, array $context = array())
      *
      * @return void
      */
-    public function alert($message, array $context = array())
+    public function alert($message, array $context = [])
     {
         $this->log(LogLevel::ALERT, $message, $context);
     }
@@ -51,7 +51,7 @@ public function alert($message, array $context = array())
      *
      * @return void
      */
-    public function critical($message, array $context = array())
+    public function critical($message, array $context = [])
     {
         $this->log(LogLevel::CRITICAL, $message, $context);
     }
@@ -65,7 +65,7 @@ public function critical($message, array $context = array())
      *
      * @return void
      */
-    public function error($message, array $context = array())
+    public function error($message, array $context = [])
     {
         $this->log(LogLevel::ERROR, $message, $context);
     }
@@ -81,7 +81,7 @@ public function error($message, array $context = array())
      *
      * @return void
      */
-    public function warning($message, array $context = array())
+    public function warning($message, array $context = [])
     {
         $this->log(LogLevel::WARNING, $message, $context);
     }
@@ -94,7 +94,7 @@ public function warning($message, array $context = array())
      *
      * @return void
      */
-    public function notice($message, array $context = array())
+    public function notice($message, array $context = [])
     {
         $this->log(LogLevel::NOTICE, $message, $context);
     }
@@ -109,7 +109,7 @@ public function notice($message, array $context = array())
      *
      * @return void
      */
-    public function info($message, array $context = array())
+    public function info($message, array $context = [])
     {
         $this->log(LogLevel::INFO, $message, $context);
     }
@@ -122,7 +122,7 @@ public function info($message, array $context = array())
      *
      * @return void
      */
-    public function debug($message, array $context = array())
+    public function debug($message, array $context = [])
     {
         $this->log(LogLevel::DEBUG, $message, $context);
     }
@@ -136,5 +136,5 @@ public function debug($message, array $context = array())
      *
      * @return void
      */
-    abstract public function log($level, $message, array $context = array());
+    abstract public function log($level, $message, array $context = []);
 }
diff --git a/classes/Psr/Log/NullLogger.php b/classes/Psr/Log/NullLogger.php
index d8cd682..abb6b53 100644
--- a/classes/Psr/Log/NullLogger.php
+++ b/classes/Psr/Log/NullLogger.php
@@ -21,7 +21,7 @@ class NullLogger extends AbstractLogger
      *
      * @return void
      */
-    public function log($level, $message, array $context = array())
+    public function log($level, $message, array $context = [])
     {
         // noop
     }
diff --git a/composer.json b/composer.json
index 2214413..d14eae9 100644
--- a/composer.json
+++ b/composer.json
@@ -10,6 +10,12 @@
       "homepage": "https://www.chesio.com"
     }
   ],
+  "config": {
+    "sort-packages": true,
+    "allow-plugins": {
+      "composer/installers": true
+    }
+  },
   "keywords": [
     "wordpress", "wordpress-plugin"
   ],
@@ -18,13 +24,14 @@
   },
   "require": {
     "php": "^7.3 || ^8.0",
-    "composer/installers": "~1.0"
+    "composer/installers": "^1.0 || ^2.0"
   },
   "require-dev": {
-    "squizlabs/php_codesniffer": "^3.2",
-    "phpunit/phpunit": "^9.5",
     "brain/monkey": "^2.3",
-    "szepeviktor/phpstan-wordpress": "^1.0"
+    "phpunit/phpunit": "^9.5",
+    "squizlabs/php_codesniffer": "^3.2",
+    "szepeviktor/phpstan-wordpress": "^1.0",
+    "yoast/phpunit-polyfills": "^1.0"
   },
   "autoload-dev": {
     "psr-4": {
@@ -37,7 +44,8 @@
   "scripts": {
     "phpcs": "phpcs",
     "phpstan": "phpstan analyze",
-    "integration-tests": "phpunit --configuration tests/integration/phpunit.xml",
+    "full-integration-tests": "phpunit --configuration tests/integration/phpunit.xml",
+    "integration-tests": "phpunit --configuration tests/integration/phpunit.xml --exclude-group external",
     "unit-tests": "phpunit --configuration tests/unit/phpunit.xml",
     "ci": [
       "@phpcs",
diff --git a/composer.lock b/composer.lock
index ece847d..6bc8cef 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "d876424c0f535f1608c0899181c5acd0",
+    "content-hash": "73c53115de536465daf74e5fa1f95e5a",
     "packages": [
         {
             "name": "composer/installers",
@@ -131,6 +131,10 @@
                 "zend",
                 "zikula"
             ],
+            "support": {
+                "issues": "https://github.com/composer/installers/issues",
+                "source": "https://github.com/composer/installers/tree/v1.9.0"
+            },
             "funding": [
                 {
                     "url": "https://packagist.com",
@@ -225,12 +229,12 @@
                 }
             },
             "autoload": {
-                "psr-4": {
-                    "Brain\\Monkey\\": "src/"
-                },
                 "files": [
                     "inc/api.php"
-                ]
+                ],
+                "psr-4": {
+                    "Brain\\Monkey\\": "src/"
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -469,9 +473,6 @@
             "require": {
                 "php": "^7.1 || ^8.0"
             },
-            "replace": {
-                "myclabs/deep-copy": "self.version"
-            },
             "require-dev": {
                 "doctrine/collections": "^1.0",
                 "doctrine/common": "^2.6",
@@ -479,12 +480,12 @@
             },
             "type": "library",
             "autoload": {
-                "psr-4": {
-                    "DeepCopy\\": "src/DeepCopy/"
-                },
                 "files": [
                     "src/DeepCopy/deep_copy.php"
-                ]
+                ],
+                "psr-4": {
+                    "DeepCopy\\": "src/DeepCopy/"
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -628,16 +629,16 @@
         },
         {
             "name": "phar-io/version",
-            "version": "3.1.0",
+            "version": "3.1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phar-io/version.git",
-                "reference": "bae7c545bef187884426f042434e561ab1ddb182"
+                "reference": "15a90844ad40f127afd244c0cad228de2a80052a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phar-io/version/zipball/bae7c545bef187884426f042434e561ab1ddb182",
-                "reference": "bae7c545bef187884426f042434e561ab1ddb182",
+                "url": "https://api.github.com/repos/phar-io/version/zipball/15a90844ad40f127afd244c0cad228de2a80052a",
+                "reference": "15a90844ad40f127afd244c0cad228de2a80052a",
                 "shasum": ""
             },
             "require": {
@@ -673,30 +674,33 @@
             "description": "Library for handling version information and constraints",
             "support": {
                 "issues": "https://github.com/phar-io/version/issues",
-                "source": "https://github.com/phar-io/version/tree/3.1.0"
+                "source": "https://github.com/phar-io/version/tree/3.1.1"
             },
-            "time": "2021-02-23T14:00:09+00:00"
+            "time": "2022-02-07T21:56:48+00:00"
         },
         {
             "name": "php-stubs/wordpress-stubs",
-            "version": "v5.8.2",
+            "version": "v5.9.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-stubs/wordpress-stubs.git",
-                "reference": "67fd773742b7be5b4463f40318b0b4890a07033b"
+                "reference": "0fa8dd9a1bd2a1b60e85afc6c798fca1f599cc1b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-stubs/wordpress-stubs/zipball/67fd773742b7be5b4463f40318b0b4890a07033b",
-                "reference": "67fd773742b7be5b4463f40318b0b4890a07033b",
+                "url": "https://api.github.com/repos/php-stubs/wordpress-stubs/zipball/0fa8dd9a1bd2a1b60e85afc6c798fca1f599cc1b",
+                "reference": "0fa8dd9a1bd2a1b60e85afc6c798fca1f599cc1b",
                 "shasum": ""
             },
             "replace": {
                 "giacocorsiglia/wordpress-stubs": "*"
             },
             "require-dev": {
-                "giacocorsiglia/stubs-generator": "^0.5.0",
-                "php": "~7.1"
+                "nikic/php-parser": "< 4.12.0",
+                "php": "~7.3 || ~8.0",
+                "php-stubs/generator": "^0.8.0",
+                "phpdocumentor/reflection-docblock": "^5.3",
+                "phpstan/phpstan": "^1.2"
             },
             "suggest": {
                 "paragonie/sodium_compat": "Pure PHP implementation of libsodium",
@@ -717,9 +721,9 @@
             ],
             "support": {
                 "issues": "https://github.com/php-stubs/wordpress-stubs/issues",
-                "source": "https://github.com/php-stubs/wordpress-stubs/tree/v5.8.2"
+                "source": "https://github.com/php-stubs/wordpress-stubs/tree/v5.9.0"
             },
-            "time": "2021-11-11T13:57:00+00:00"
+            "time": "2022-01-26T00:27:45+00:00"
         },
         {
             "name": "phpdocumentor/reflection-common",
@@ -833,16 +837,16 @@
         },
         {
             "name": "phpdocumentor/type-resolver",
-            "version": "1.5.1",
+            "version": "1.6.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpDocumentor/TypeResolver.git",
-                "reference": "a12f7e301eb7258bb68acd89d4aefa05c2906cae"
+                "reference": "93ebd0014cab80c4ea9f5e297ea48672f1b87706"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/a12f7e301eb7258bb68acd89d4aefa05c2906cae",
-                "reference": "a12f7e301eb7258bb68acd89d4aefa05c2906cae",
+                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/93ebd0014cab80c4ea9f5e297ea48672f1b87706",
+                "reference": "93ebd0014cab80c4ea9f5e297ea48672f1b87706",
                 "shasum": ""
             },
             "require": {
@@ -877,22 +881,22 @@
             "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names",
             "support": {
                 "issues": "https://github.com/phpDocumentor/TypeResolver/issues",
-                "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.5.1"
+                "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.6.0"
             },
-            "time": "2021-10-02T14:08:47+00:00"
+            "time": "2022-01-04T19:58:01+00:00"
         },
         {
             "name": "phpspec/prophecy",
-            "version": "1.14.0",
+            "version": "v1.15.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpspec/prophecy.git",
-                "reference": "d86dfc2e2a3cd366cee475e52c6bb3bbc371aa0e"
+                "reference": "bbcd7380b0ebf3961ee21409db7b38bc31d69a13"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/d86dfc2e2a3cd366cee475e52c6bb3bbc371aa0e",
-                "reference": "d86dfc2e2a3cd366cee475e52c6bb3bbc371aa0e",
+                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/bbcd7380b0ebf3961ee21409db7b38bc31d69a13",
+                "reference": "bbcd7380b0ebf3961ee21409db7b38bc31d69a13",
                 "shasum": ""
             },
             "require": {
@@ -944,22 +948,22 @@
             ],
             "support": {
                 "issues": "https://github.com/phpspec/prophecy/issues",
-                "source": "https://github.com/phpspec/prophecy/tree/1.14.0"
+                "source": "https://github.com/phpspec/prophecy/tree/v1.15.0"
             },
-            "time": "2021-09-10T09:02:12+00:00"
+            "time": "2021-12-08T12:19:24+00:00"
         },
         {
             "name": "phpstan/phpstan",
-            "version": "1.2.0",
+            "version": "1.4.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "cbe085f9fdead5b6d62e4c022ca52dc9427a10ee"
+                "reference": "8a7761f1c520e0dad6e04d862fdc697445457cfe"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/cbe085f9fdead5b6d62e4c022ca52dc9427a10ee",
-                "reference": "cbe085f9fdead5b6d62e4c022ca52dc9427a10ee",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/8a7761f1c520e0dad6e04d862fdc697445457cfe",
+                "reference": "8a7761f1c520e0dad6e04d862fdc697445457cfe",
                 "shasum": ""
             },
             "require": {
@@ -975,7 +979,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.2-dev"
+                    "dev-master": "1.4-dev"
                 }
             },
             "autoload": {
@@ -990,7 +994,7 @@
             "description": "PHPStan - PHP Static Analysis Tool",
             "support": {
                 "issues": "https://github.com/phpstan/phpstan/issues",
-                "source": "https://github.com/phpstan/phpstan/tree/1.2.0"
+                "source": "https://github.com/phpstan/phpstan/tree/1.4.6"
             },
             "funding": [
                 {
@@ -1010,20 +1014,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-11-18T14:09:01+00:00"
+            "time": "2022-02-06T12:56:13+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",
-            "version": "9.2.9",
+            "version": "9.2.10",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "f301eb1453c9e7a1bc912ee8b0ea9db22c60223b"
+                "reference": "d5850aaf931743067f4bfc1ae4cbd06468400687"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/f301eb1453c9e7a1bc912ee8b0ea9db22c60223b",
-                "reference": "f301eb1453c9e7a1bc912ee8b0ea9db22c60223b",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/d5850aaf931743067f4bfc1ae4cbd06468400687",
+                "reference": "d5850aaf931743067f4bfc1ae4cbd06468400687",
                 "shasum": ""
             },
             "require": {
@@ -1079,7 +1083,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
-                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.9"
+                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.10"
             },
             "funding": [
                 {
@@ -1087,20 +1091,20 @@
                     "type": "github"
                 }
             ],
-            "time": "2021-11-19T15:21:02+00:00"
+            "time": "2021-12-05T09:12:13+00:00"
         },
         {
             "name": "phpunit/php-file-iterator",
-            "version": "3.0.5",
+            "version": "3.0.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
-                "reference": "aa4be8575f26070b100fccb67faabb28f21f66f8"
+                "reference": "cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/aa4be8575f26070b100fccb67faabb28f21f66f8",
-                "reference": "aa4be8575f26070b100fccb67faabb28f21f66f8",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf",
+                "reference": "cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf",
                 "shasum": ""
             },
             "require": {
@@ -1139,7 +1143,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-file-iterator/issues",
-                "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/3.0.5"
+                "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/3.0.6"
             },
             "funding": [
                 {
@@ -1147,7 +1151,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-09-28T05:57:25+00:00"
+            "time": "2021-12-02T12:48:52+00:00"
         },
         {
             "name": "phpunit/php-invoker",
@@ -1332,16 +1336,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "9.5.10",
+            "version": "9.5.13",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "c814a05837f2edb0d1471d6e3f4ab3501ca3899a"
+                "reference": "597cb647654ede35e43b137926dfdfef0fb11743"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/c814a05837f2edb0d1471d6e3f4ab3501ca3899a",
-                "reference": "c814a05837f2edb0d1471d6e3f4ab3501ca3899a",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/597cb647654ede35e43b137926dfdfef0fb11743",
+                "reference": "597cb647654ede35e43b137926dfdfef0fb11743",
                 "shasum": ""
             },
             "require": {
@@ -1392,11 +1396,11 @@
                 }
             },
             "autoload": {
-                "classmap": [
-                    "src/"
-                ],
                 "files": [
                     "src/Framework/Assert/Functions.php"
+                ],
+                "classmap": [
+                    "src/"
                 ]
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -1419,11 +1423,11 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/phpunit/issues",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.10"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.13"
             },
             "funding": [
                 {
-                    "url": "https://phpunit.de/donate.html",
+                    "url": "https://phpunit.de/sponsors.html",
                     "type": "custom"
                 },
                 {
@@ -1431,7 +1435,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2021-09-25T07:38:51+00:00"
+            "time": "2022-01-24T07:33:35+00:00"
         },
         {
             "name": "sebastian/cli-parser",
@@ -1939,16 +1943,16 @@
         },
         {
             "name": "sebastian/global-state",
-            "version": "5.0.3",
+            "version": "5.0.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/global-state.git",
-                "reference": "23bd5951f7ff26f12d4e3242864df3e08dec4e49"
+                "reference": "0ca8db5a5fc9c8646244e629625ac486fa286bf2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/23bd5951f7ff26f12d4e3242864df3e08dec4e49",
-                "reference": "23bd5951f7ff26f12d4e3242864df3e08dec4e49",
+                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/0ca8db5a5fc9c8646244e629625ac486fa286bf2",
+                "reference": "0ca8db5a5fc9c8646244e629625ac486fa286bf2",
                 "shasum": ""
             },
             "require": {
@@ -1991,7 +1995,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/global-state/issues",
-                "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.3"
+                "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.5"
             },
             "funding": [
                 {
@@ -1999,7 +2003,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2021-06-11T13:31:12+00:00"
+            "time": "2022-02-14T08:28:10+00:00"
         },
         {
             "name": "sebastian/lines-of-code",
@@ -2399,16 +2403,16 @@
         },
         {
             "name": "squizlabs/php_codesniffer",
-            "version": "3.6.1",
+            "version": "3.6.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
-                "reference": "f268ca40d54617c6e06757f83f699775c9b3ff2e"
+                "reference": "5e4e71592f69da17871dba6e80dd51bce74a351a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/f268ca40d54617c6e06757f83f699775c9b3ff2e",
-                "reference": "f268ca40d54617c6e06757f83f699775c9b3ff2e",
+                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/5e4e71592f69da17871dba6e80dd51bce74a351a",
+                "reference": "5e4e71592f69da17871dba6e80dd51bce74a351a",
                 "shasum": ""
             },
             "require": {
@@ -2451,25 +2455,28 @@
                 "source": "https://github.com/squizlabs/PHP_CodeSniffer",
                 "wiki": "https://github.com/squizlabs/PHP_CodeSniffer/wiki"
             },
-            "time": "2021-10-11T04:00:11+00:00"
+            "time": "2021-12-12T21:44:58+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",
-            "version": "v1.23.0",
+            "version": "v1.24.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-ctype.git",
-                "reference": "46cd95797e9df938fdd2b03693b5fca5e64b01ce"
+                "reference": "30885182c981ab175d4d034db0f6f469898070ab"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/46cd95797e9df938fdd2b03693b5fca5e64b01ce",
-                "reference": "46cd95797e9df938fdd2b03693b5fca5e64b01ce",
+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/30885182c981ab175d4d034db0f6f469898070ab",
+                "reference": "30885182c981ab175d4d034db0f6f469898070ab",
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.1"
             },
+            "provide": {
+                "ext-ctype": "*"
+            },
             "suggest": {
                 "ext-ctype": "For best performance"
             },
@@ -2484,12 +2491,12 @@
                 }
             },
             "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Ctype\\": ""
-                },
                 "files": [
                     "bootstrap.php"
-                ]
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Ctype\\": ""
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -2514,7 +2521,7 @@
                 "portable"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.23.0"
+                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.24.0"
             },
             "funding": [
                 {
@@ -2530,7 +2537,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-02-19T12:13:01+00:00"
+            "time": "2021-10-20T20:35:02+00:00"
         },
         {
             "name": "symfony/polyfill-php73",
@@ -2560,12 +2567,12 @@
                 }
             },
             "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Php73\\": ""
-                },
                 "files": [
                     "bootstrap.php"
                 ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Php73\\": ""
+                },
                 "classmap": [
                     "Resources/stubs"
                 ]
@@ -2783,6 +2790,67 @@
                 "source": "https://github.com/webmozarts/assert/tree/1.10.0"
             },
             "time": "2021-03-09T10:59:23+00:00"
+        },
+        {
+            "name": "yoast/phpunit-polyfills",
+            "version": "1.0.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/Yoast/PHPUnit-Polyfills.git",
+                "reference": "5ea3536428944955f969bc764bbe09738e151ada"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/Yoast/PHPUnit-Polyfills/zipball/5ea3536428944955f969bc764bbe09738e151ada",
+                "reference": "5ea3536428944955f969bc764bbe09738e151ada",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.4",
+                "phpunit/phpunit": "^4.8.36 || ^5.7.21 || ^6.0 || ^7.0 || ^8.0 || ^9.0"
+            },
+            "require-dev": {
+                "yoast/yoastcs": "^2.2.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "1.x-dev",
+                    "dev-develop": "1.x-dev"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "phpunitpolyfills-autoload.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Team Yoast",
+                    "email": "support@yoast.com",
+                    "homepage": "https://yoast.com"
+                },
+                {
+                    "name": "Contributors",
+                    "homepage": "https://github.com/Yoast/PHPUnit-Polyfills/graphs/contributors"
+                }
+            ],
+            "description": "Set of polyfills for changed PHPUnit functionality to allow for creating PHPUnit cross-version compatible tests",
+            "homepage": "https://github.com/Yoast/PHPUnit-Polyfills",
+            "keywords": [
+                "phpunit",
+                "polyfill",
+                "testing"
+            ],
+            "support": {
+                "issues": "https://github.com/Yoast/PHPUnit-Polyfills/issues",
+                "source": "https://github.com/Yoast/PHPUnit-Polyfills"
+            },
+            "time": "2021-11-23T01:37:03+00:00"
         }
     ],
     "aliases": [],
@@ -2794,5 +2862,5 @@
         "php": "^7.3 || ^8.0"
     },
     "platform-dev": [],
-    "plugin-api-version": "2.1.0"
+    "plugin-api-version": "2.3.0"
 }
diff --git a/phpstan.neon b/phpstan.neon
index d3872d9..b47e329 100644
--- a/phpstan.neon
+++ b/phpstan.neon
@@ -2,7 +2,10 @@ includes:
     - phar://phpstan.phar/conf/bleedingEdge.neon
     - vendor/szepeviktor/phpstan-wordpress/extension.neon
 parameters:
-    level: 2
+    level: 6
+    # https://phpstan.org/config-reference#vague-typehints
+    checkGenericClassInNonGenericObjectType: false
+    checkMissingIterableValueType: false
     paths:
         - %currentWorkingDirectory%/classes/
     bootstrapFiles:
diff --git a/tests/integration/bin/install-wp-tests.sh b/tests/integration/bin/install-wp-tests.sh
index 1005bf4..ee05775 100755
--- a/tests/integration/bin/install-wp-tests.sh
+++ b/tests/integration/bin/install-wp-tests.sh
@@ -15,7 +15,7 @@ SKIP_DB_CREATE=${6-false}
 TMPDIR=${TMPDIR-/tmp}
 TMPDIR=$(echo $TMPDIR | sed -e "s/\/$//")
 WP_TESTS_DIR=${WP_TESTS_DIR-$TMPDIR/wordpress-tests-lib}
-WP_CORE_DIR=${WP_CORE_DIR-$TMPDIR/wordpress/}
+WP_CORE_DIR=${WP_CORE_DIR-$TMPDIR/wordpress}
 
 download() {
     if [ `which curl` ]; then
@@ -62,10 +62,10 @@ install_wp() {
 	mkdir -p $WP_CORE_DIR
 
 	if [[ $WP_VERSION == 'nightly' || $WP_VERSION == 'trunk' ]]; then
-		mkdir -p $TMPDIR/wordpress-nightly
-		download https://wordpress.org/nightly-builds/wordpress-latest.zip  $TMPDIR/wordpress-nightly/wordpress-nightly.zip
-		unzip -q $TMPDIR/wordpress-nightly/wordpress-nightly.zip -d $TMPDIR/wordpress-nightly/
-		mv $TMPDIR/wordpress-nightly/wordpress/* $WP_CORE_DIR
+		mkdir -p $TMPDIR/wordpress-trunk
+		rm -rf $TMPDIR/wordpress-trunk/*
+		svn export --quiet https://core.svn.wordpress.org/trunk $TMPDIR/wordpress-trunk/wordpress
+		mv $TMPDIR/wordpress-trunk/wordpress/* $WP_CORE_DIR
 	else
 		if [ $WP_VERSION == 'latest' ]; then
 			local ARCHIVE_NAME='latest'
@@ -107,8 +107,9 @@ install_test_suite() {
 	if [ ! -d $WP_TESTS_DIR ]; then
 		# set up testing suite
 		mkdir -p $WP_TESTS_DIR
-		svn co --quiet --ignore-externals https://develop.svn.wordpress.org/${WP_TESTS_TAG}/tests/phpunit/includes/ $WP_TESTS_DIR/includes
-		svn co --quiet --ignore-externals https://develop.svn.wordpress.org/${WP_TESTS_TAG}/tests/phpunit/data/ $WP_TESTS_DIR/data
+		rm -rf $WP_TESTS_DIR/{includes,data}
+		svn export --quiet --ignore-externals https://develop.svn.wordpress.org/${WP_TESTS_TAG}/tests/phpunit/includes/ $WP_TESTS_DIR/includes
+		svn export --quiet --ignore-externals https://develop.svn.wordpress.org/${WP_TESTS_TAG}/tests/phpunit/data/ $WP_TESTS_DIR/data
 	fi
 
 	if [ ! -f wp-tests-config.php ]; then
@@ -116,6 +117,7 @@ install_test_suite() {
 		# remove all forward slashes in the end
 		WP_CORE_DIR=$(echo $WP_CORE_DIR | sed "s:/\+$::")
 		sed $ioption "s:dirname( __FILE__ ) . '/src/':'$WP_CORE_DIR/':" "$WP_TESTS_DIR"/wp-tests-config.php
+		sed $ioption "s:__DIR__ . '/src/':'$WP_CORE_DIR/':" "$WP_TESTS_DIR"/wp-tests-config.php
 		sed $ioption "s/youremptytestdbnamehere/$DB_NAME/" "$WP_TESTS_DIR"/wp-tests-config.php
 		sed $ioption "s/yourusernamehere/$DB_USER/" "$WP_TESTS_DIR"/wp-tests-config.php
 		sed $ioption "s/yourpasswordhere/$DB_PASS/" "$WP_TESTS_DIR"/wp-tests-config.php
@@ -124,6 +126,23 @@ install_test_suite() {
 
 }
 
+recreate_db() {
+	shopt -s nocasematch
+	if [[ $1 =~ ^(y|yes)$ ]]
+	then
+		mysqladmin drop $DB_NAME -f --user="$DB_USER" --password="$DB_PASS"$EXTRA
+		create_db
+		echo "Recreated the database ($DB_NAME)."
+	else
+		echo "Leaving the existing database ($DB_NAME) in place."
+	fi
+	shopt -u nocasematch
+}
+
+create_db() {
+	mysqladmin create $DB_NAME --user="$DB_USER" --password="$DB_PASS"$EXTRA
+}
+
 install_db() {
 
 	if [ ${SKIP_DB_CREATE} = "true" ]; then
@@ -147,7 +166,14 @@ install_db() {
 	fi
 
 	# create database
-	mysqladmin create $DB_NAME --user="$DB_USER" --password="$DB_PASS"$EXTRA
+	if [ $(mysql --user="$DB_USER" --password="$DB_PASS"$EXTRA --execute='show databases;' | grep ^$DB_NAME$) ]
+	then
+		echo "Reinstalling will delete the existing test database ($DB_NAME)"
+		read -p 'Are you sure you want to proceed? [y/N]: ' DELETE_EXISTING_DB
+		recreate_db $DELETE_EXISTING_DB
+	else
+		create_db
+	fi
 }
 
 install_wp
diff --git a/tests/integration/phpunit.xml b/tests/integration/phpunit.xml
index cbeacb4..cdff42d 100644
--- a/tests/integration/phpunit.xml
+++ b/tests/integration/phpunit.xml
@@ -2,6 +2,7 @@
 <phpunit
 	bootstrap="./bootstrap.php"
 	backupGlobals="false"
+	cacheResult="false"
 	colors="true"
 	convertErrorsToExceptions="true"
 	convertNoticesToExceptions="true"
diff --git a/tests/integration/src/Bootstrap.php b/tests/integration/src/Bootstrap.php
index 9204b38..5c0585b 100644
--- a/tests/integration/src/Bootstrap.php
+++ b/tests/integration/src/Bootstrap.php
@@ -11,6 +11,15 @@ class Bootstrap
     public $wp_tests_dir;
 
 
+    /**
+     * @return string Path to root directory of the plugin.
+     */
+    public static function getPluginRootDirectory(): string
+    {
+        return dirname(dirname(dirname(__DIR__)));
+    }
+
+
     /**
      * @return string Path to where WordPress tests library is installed.
      */
@@ -25,7 +34,7 @@ public static function getWordPressTestsDirectory(): string
      */
     public function __construct()
     {
-        $this->plugin_dir   = dirname(dirname(dirname(__DIR__)));
+        $this->plugin_dir   = self::getPluginRootDirectory();
         $this->wp_tests_dir = self::getWordPressTestsDirectory();
     }
 
@@ -43,20 +52,22 @@ public function run()
             $_SERVER['SERVER_NAME'] = 'bc-security.test';
         }
 
-        // Load test function so tests_add_filter() is available.
+        // Give access to tests_add_filter() function.
         require_once $this->wp_tests_dir . '/includes/functions.php';
 
+        // Clean existing install first.
         tests_add_filter('muplugins_loaded', function () {
-            // Clean existing install first.
             define('WP_UNINSTALL_PLUGIN', true);
             require_once $this->plugin_dir . '/uninstall.php';
         });
 
         tests_add_filter('muplugins_loaded', function () {
-            // Load the plugin.
-            require_once $this->plugin_dir . '/bc-security.php';
-            // Manually activate the plugin.
-            $bc_security->activate();
+            // Bootstrap the plugin ...
+            $bc_security = require_once $this->plugin_dir . '/bc-security.php';
+            // ... activate it ...
+            do_action('activate_' . plugin_basename($this->plugin_dir . '/bc-security.php'));
+            // ... but do not load it yet - it is loaded manually before every test.
+            remove_action('plugins_loaded', [$bc_security, 'load'], 0);
         });
 
         // Start up the WP testing environment.
diff --git a/tests/integration/src/Cases/Helpers/HaveIBeenPwnedTest.php b/tests/integration/src/Cases/Helpers/HaveIBeenPwnedTest.php
index 8b775d9..c9faccf 100644
--- a/tests/integration/src/Cases/Helpers/HaveIBeenPwnedTest.php
+++ b/tests/integration/src/Cases/Helpers/HaveIBeenPwnedTest.php
@@ -4,17 +4,47 @@
 
 use BlueChip\Security\Helpers\HaveIBeenPwned;
 use BlueChip\Security\Tests\Integration\Constants;
+use BlueChip\Security\Tests\Integration\TestCase;
 
-class HaveIBeenPwnedTest extends \BlueChip\Security\Tests\Integration\TestCase
+/**
+ * Test integration with Pwned Passwords API.
+ *
+ * @internal These tests result in external requests to https://api.pwnedpasswords.com being made!
+ */
+class HaveIBeenPwnedTest extends TestCase
 {
     /**
-     * Test integration with Pwned Passwords API.
+     * Test that pwned password is reported as such.
      *
-     * Important: this test results in external requests to https://api.pwnedpasswords.com being made!
+     * @group external
      */
     public function testPwnedPassword()
     {
-        $this->assertTrue(HaveIBeenPwned::hasPasswordBeenPwned(Constants::PWNED_PASSWORD));
-        $this->assertFalse(HaveIBeenPwned::hasPasswordBeenPwned(Constants::SAFE_PASSWORD));
+        $result = HaveIBeenPwned::hasPasswordBeenPwned(Constants::PWNED_PASSWORD);
+
+        if ($result === null) {
+            $this->markTestSkipped('Request to api.pwnedpasswords.com failed.');
+            return;
+        }
+
+        $this->assertTrue($result);
+    }
+
+
+    /**
+     * Test that safe password is reported as such.
+     *
+     * @group external
+     */
+    public function testSafePassword()
+    {
+        $result = HaveIBeenPwned::hasPasswordBeenPwned(Constants::SAFE_PASSWORD);
+
+        if ($result === null) {
+            $this->markTestSkipped('Request to api.pwnedpasswords.com failed.');
+            return;
+        }
+
+        $this->assertFalse($result);
     }
 }
diff --git a/tests/integration/src/Cases/Helpers/IsTest.php b/tests/integration/src/Cases/Helpers/IsTest.php
index bb42830..7958640 100644
--- a/tests/integration/src/Cases/Helpers/IsTest.php
+++ b/tests/integration/src/Cases/Helpers/IsTest.php
@@ -4,8 +4,9 @@
 
 use BlueChip\Security\Helpers\Hooks;
 use BlueChip\Security\Helpers\Is;
+use BlueChip\Security\Tests\Integration\TestCase;
 
-class IsTest extends \BlueChip\Security\Tests\Integration\TestCase
+class IsTest extends TestCase
 {
     /**
      * Test Is::admin() method and `bc-security/filter:is-admin` filter.
diff --git a/tests/integration/src/Cases/Helpers/UtilsTest.php b/tests/integration/src/Cases/Helpers/UtilsTest.php
new file mode 100644
index 0000000..b4a441f
--- /dev/null
+++ b/tests/integration/src/Cases/Helpers/UtilsTest.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace BlueChip\Security\Tests\Integration\Cases\Helpers;
+
+use BlueChip\Security\Helpers\Utils;
+use BlueChip\Security\Tests\Integration\TestCase;
+
+class UtilsTest extends TestCase
+{
+    /**
+     * Ensure that blocking access results in wp_die() being called with proper response code.
+     */
+    public function testBlockAccessTemporarily()
+    {
+        $exception = null;
+
+        try {
+            Utils::blockAccessTemporarily();
+        } catch (\WPDieException $exception) {
+            $this->assertSame(503, $exception->getCode());
+        }
+
+        $this->assertInstanceOf(\WPDieException::class, $exception);
+    }
+}
diff --git a/tests/integration/src/Cases/Modules/Cron/JobTest.php b/tests/integration/src/Cases/Modules/Cron/JobTest.php
index ca2db59..b92d844 100644
--- a/tests/integration/src/Cases/Modules/Cron/JobTest.php
+++ b/tests/integration/src/Cases/Modules/Cron/JobTest.php
@@ -3,8 +3,9 @@
 namespace BlueChip\Security\Tests\Integration\Cases\Modules\Cron;
 
 use BlueChip\Security\Modules\Cron;
+use BlueChip\Security\Tests\Integration\TestCase;
 
-class JobTest extends \BlueChip\Security\Tests\Integration\TestCase
+class JobTest extends TestCase
 {
     private const HOOK = 'test-job';
 
@@ -22,7 +23,7 @@ public function testScheduling()
 
         // ...test...
         $this->assertTrue($job->isScheduled());
-        $this->assertInternalType('int', wp_next_scheduled(self::HOOK));
+        $this->assertIsInt(wp_next_scheduled(self::HOOK));
 
         // ...and forward the job.
         return $job;
diff --git a/tests/integration/src/Cases/Modules/Hardening/ActiveTest.php b/tests/integration/src/Cases/Modules/Hardening/ActiveTest.php
new file mode 100644
index 0000000..0fba094
--- /dev/null
+++ b/tests/integration/src/Cases/Modules/Hardening/ActiveTest.php
@@ -0,0 +1,57 @@
+<?php
+
+namespace BlueChip\Security\Tests\Integration\Cases\Modules\Hardening;
+
+use BlueChip\Security\Tests\Integration\Constants;
+
+/**
+ * Test hardening with all options on.
+ */
+class ActiveTest extends TestCase
+{
+    protected function prepareTest(): void
+    {
+        parent::prepareTest();
+
+        // Turn all hardening options on.
+        $this->setHardening(true);
+    }
+
+
+    /**
+     * Test everything that does not require external HTTP requests.
+     */
+    public function testHardeningActive(): void
+    {
+        $this->assertArrayNotHasKey(
+            'pingback.ping',
+            \apply_filters('xmlrpc_methods', ['pingback.ping' => 'pingback_ping', ])
+        );
+
+        $this->assertFalse(\apply_filters('xmlrpc_enabled', true));
+
+        // Authentication with both email and login should fail.
+        $this->assertWpError(\wp_authenticate(self::DUMMY_USER_EMAIL, Constants::FACTORY_PASSWORD));
+        $this->assertWpError(\wp_authenticate(self::DUMMY_USER_LOGIN, Constants::FACTORY_PASSWORD));
+    }
+
+
+    /**
+     * Test user editation with password change.
+     *
+     * @group external
+     */
+    public function testPasswordChange(): void
+    {
+        // Test strong password - should pass.
+        $this->setUpUserPostData(Constants::SAFE_PASSWORD);
+        $this->assertIsInt(\edit_user($this->dummy_user_id));
+
+        // Test weak password - should not pass.
+        $this->setUpUserPostData(Constants::PWNED_PASSWORD);
+        $this->assertWpError(\edit_user($this->dummy_user_id));
+
+        // Clean up.
+        $this->tearDownUserPostData();
+    }
+}
diff --git a/tests/integration/src/Cases/Modules/Hardening/CoreTest.php b/tests/integration/src/Cases/Modules/Hardening/CoreTest.php
deleted file mode 100644
index 12a1cff..0000000
--- a/tests/integration/src/Cases/Modules/Hardening/CoreTest.php
+++ /dev/null
@@ -1,107 +0,0 @@
-<?php
-
-namespace BlueChip\Security\Tests\Integration\Cases\Modules\Hardening;
-
-use BlueChip\Security\Modules\Hardening;
-use BlueChip\Security\Tests\Integration\Constants;
-
-class CoreTest extends \BlueChip\Security\Tests\Integration\TestCase
-{
-    /**
-     * Initialize the hardening with either active or non active state..
-     * @param bool $active
-     */
-    protected function initHardening(bool $active)
-    {
-        // Mock settings object, make it always return given active state.
-        $settings = \Mockery::mock(Hardening\Settings::class, ['offsetGet' => $active]);
-
-        (new Hardening\Core($settings))->init();
-    }
-
-
-    /**
-     * Set up $_POST data necessary to test via \edit_user() function.
-     * @param bool $pwned Whether to set weak password (true) or strong password (false).
-     */
-    protected function setUpUserPostData(bool $pwned = false)
-    {
-        // To be able to test \edit_user() method.
-        $_POST['nickname'] = 'John Doe';
-        $_POST['email'] = 'john@doe.com';
-        $_POST['pass1'] = $pwned ? Constants::PWNED_PASSWORD : Constants::SAFE_PASSWORD;
-        $_POST['pass2'] = $pwned ? Constants::PWNED_PASSWORD : Constants::SAFE_PASSWORD;
-    }
-
-
-    /**
-     * Clean up $_POST data set in setUpUserPostData() method.
-     */
-    protected function tearDownUserPostData()
-    {
-        unset($_POST['nickname']);
-        unset($_POST['email']);
-        unset($_POST['pass1']);
-        unset($_POST['pass2']);
-    }
-
-
-    /**
-     * Test the case when hardening options are active.
-     */
-    public function testHardeningActive()
-    {
-        $this->initHardening(true);
-
-        $this->assertArrayNotHasKey(
-            'pingback.ping',
-            apply_filters('xmlrpc_methods', ['pingback.ping' => 'pingback_ping', ])
-        );
-
-        $this->assertFalse(apply_filters('xmlrpc_enabled', true));
-
-        // Create dummy user object.
-        $user_id = $this->factory->user->create();
-
-        // Test strong password - should pass.
-        $this->setUpUserPostData(false);
-        $this->assertIsInt(\edit_user($user_id));
-
-        // Test weak password - should not pass.
-        $this->setUpUserPostData(true);
-        $this->assertWpError(\edit_user($user_id));
-
-        // Clean up.
-        $this->tearDownUserPostData();
-    }
-
-
-    /**
-     * Test the case when no hardening option is active.
-     */
-    public function testHardeningInactive()
-    {
-        $this->initHardening(false);
-
-        $this->assertArrayHasKey(
-            'pingback.ping',
-            apply_filters('xmlrpc_methods', ['pingback.ping' => 'this:pingback_ping', ])
-        );
-
-        $this->assertTrue(apply_filters('xmlrpc_enabled', true));
-
-        // Create dummy user object.
-        $user_id = $this->factory->user->create();
-
-        // Test strong password - should pass.
-        $this->setUpUserPostData(false);
-        $this->assertIsInt(\edit_user($user_id));
-
-        // Test weak password - should pass as well.
-        $this->setUpUserPostData(true);
-        $this->assertIsInt(\edit_user($user_id));
-
-        // Clean up.
-        $this->tearDownUserPostData();
-    }
-}
diff --git a/tests/integration/src/Cases/Modules/Hardening/InactiveTest.php b/tests/integration/src/Cases/Modules/Hardening/InactiveTest.php
new file mode 100644
index 0000000..4fb869f
--- /dev/null
+++ b/tests/integration/src/Cases/Modules/Hardening/InactiveTest.php
@@ -0,0 +1,57 @@
+<?php
+
+namespace BlueChip\Security\Tests\Integration\Cases\Modules\Hardening;
+
+use BlueChip\Security\Tests\Integration\Constants;
+
+/**
+ * Test hardening with all options off.
+ */
+class InactiveTest extends TestCase
+{
+    protected function prepareTest(): void
+    {
+        parent::prepareTest();
+
+        // Turn all hardening options off.
+        $this->setHardening(false);
+    }
+
+
+    /**
+     * Test everything that does not require external HTTP requests.
+     */
+    public function testHardeningInactive(): void
+    {
+        $this->assertArrayHasKey(
+            'pingback.ping',
+            \apply_filters('xmlrpc_methods', ['pingback.ping' => 'this:pingback_ping', ])
+        );
+
+        $this->assertTrue(\apply_filters('xmlrpc_enabled', true));
+
+        // Authentication with both email and login should pass.
+        $this->assertInstanceOf(\WP_User::class, \wp_authenticate(self::DUMMY_USER_EMAIL, Constants::FACTORY_PASSWORD));
+        $this->assertInstanceOf(\WP_User::class, \wp_authenticate(self::DUMMY_USER_LOGIN, Constants::FACTORY_PASSWORD));
+    }
+
+
+    /**
+     * Test user editation with password change.
+     *
+     * @group external
+     */
+    public function testPasswordChange(): void
+    {
+        // Test strong password - should pass.
+        $this->setUpUserPostData(Constants::SAFE_PASSWORD);
+        $this->assertIsInt(\edit_user($this->dummy_user_id));
+
+        // Test weak password - should pass as well.
+        $this->setUpUserPostData(Constants::PWNED_PASSWORD);
+        $this->assertIsInt(\edit_user($this->dummy_user_id));
+
+        // Clean up.
+        $this->tearDownUserPostData();
+    }
+}
diff --git a/tests/integration/src/Cases/Modules/Hardening/TestCase.php b/tests/integration/src/Cases/Modules/Hardening/TestCase.php
new file mode 100644
index 0000000..95fe3c6
--- /dev/null
+++ b/tests/integration/src/Cases/Modules/Hardening/TestCase.php
@@ -0,0 +1,72 @@
+<?php
+
+namespace BlueChip\Security\Tests\Integration\Cases\Modules\Hardening;
+
+use BlueChip\Security\Settings;
+use BlueChip\Security\Tests\Integration\TestCase as IntegrationTestCase;
+
+abstract class TestCase extends IntegrationTestCase
+{
+    /**
+     * @var string
+     */
+    protected const DUMMY_USER_EMAIL = 'dummy@example.com';
+
+    /**
+     * @var string
+     */
+    protected const DUMMY_USER_LOGIN = 'dummy';
+
+    /**
+     * @var int
+     */
+    protected $dummy_user_id;
+
+
+    protected function prepareTest(): void
+    {
+        // Create dummy user object.
+        $this->dummy_user_id = $this->factory->user->create([
+            'user_email' => self::DUMMY_USER_EMAIL,
+            'user_login' => self::DUMMY_USER_LOGIN,
+        ]);
+    }
+
+
+    /**
+     * @param bool $active Set to true to get settings with all hardening options on and vice versa for false.
+     */
+    protected function setHardening(bool $active): void
+    {
+        $settings = (new Settings())->forHardening();
+
+        $settings->set(\array_fill_keys(\array_keys($settings->get()), $active));
+    }
+
+
+    /**
+     * Set up $_POST data necessary to test via \edit_user() function.
+     *
+     * @param string $password
+     */
+    protected function setUpUserPostData(string $password): void
+    {
+        // To be able to test \edit_user() method.
+        $_POST['nickname'] = 'John Doe';
+        $_POST['email'] = 'john@doe.com';
+        $_POST['pass1'] = $password;
+        $_POST['pass2'] = $password;
+    }
+
+
+    /**
+     * Clean up $_POST data set in setUpUserPostData() method.
+     */
+    protected function tearDownUserPostData(): void
+    {
+        unset($_POST['nickname']);
+        unset($_POST['email']);
+        unset($_POST['pass1']);
+        unset($_POST['pass2']);
+    }
+}
diff --git a/tests/integration/src/Cases/Modules/Login/GatekeeperTest.php b/tests/integration/src/Cases/Modules/Login/GatekeeperTest.php
new file mode 100644
index 0000000..832664f
--- /dev/null
+++ b/tests/integration/src/Cases/Modules/Login/GatekeeperTest.php
@@ -0,0 +1,111 @@
+<?php
+
+namespace BlueChip\Security\Tests\Integration\Cases\Modules\Login;
+
+use BlueChip\Security\Modules\Login;
+use BlueChip\Security\Settings;
+use BlueChip\Security\Tests\Integration\Constants;
+use BlueChip\Security\Tests\Integration\TestCase;
+
+class GatekeeperTest extends TestCase
+{
+    /**
+     * @internal WP test suite already includes user with username `admin`, so there is no need to explicitly create it.
+     *
+     * @var string Existing username that is on username blacklist.
+     */
+    private const ADMIN = 'admin';
+
+    /**
+     * @var string Non-existing username that is on username blacklist.
+     */
+    private const ADMINISTRATOR = 'administrator';
+
+    /**
+     * @var string Existing username that is not on username blacklist.
+     */
+    private const CHESIO = 'chesio';
+
+
+    /**
+     * Setup username blacklist before every test.
+     */
+    public function prepareTest(): void
+    {
+        // Add `admin` via settings.
+        (new Settings())->forLogin()->update(Login\Settings::USERNAME_BLACKLIST, [self::ADMIN,]);
+
+        // Add `administrator` via filter - this way the filter is tested as well.
+        \add_filter(
+            Login\Hooks::USERNAME_BLACKLIST,
+            function (array $usernames): array {
+                return \array_merge($usernames, [self::ADMINISTRATOR]);
+            }
+        );
+
+        // Create additional user.
+        $this->factory->user->create(['user_login' => self::CHESIO]);
+    }
+
+
+    public function testExistingBlacklistedUsernameIsNotLocked()
+    {
+        // Ensure that login with existing username succeeds even if blacklisted.
+        $this->authenticateShouldPass(self::ADMIN, Constants::FACTORY_PASSWORD);
+    }
+
+
+    public function testNonExistingBlacklistedUsernameIsLocked()
+    {
+        // Ensure that login with non-existing username gets blocked when if blacklisted.
+        $this->authenticateShouldDie(self::ADMINISTRATOR, Constants::FACTORY_PASSWORD);
+    }
+
+
+    public function testExistingNonBlacklistedUsernameIsNotLocked()
+    {
+        // Ensure that login with existing username succeeds when not blacklisted.
+        $this->authenticateShouldPass(self::CHESIO, Constants::FACTORY_PASSWORD);
+    }
+
+
+    public function testAccessLock()
+    {
+        // Login with non-existing blacklisted username should die and get our IP locked ...
+        $this->authenticateShouldDie(self::ADMINISTRATOR, Constants::FACTORY_PASSWORD);
+
+        // ... therefore any successive logins should die as well, even with username that is not on blacklist.
+        $this->authenticateShouldDie(self::ADMIN, Constants::FACTORY_PASSWORD);
+        $this->authenticateShouldDie(self::CHESIO, Constants::FACTORY_PASSWORD);
+    }
+
+
+    /**
+     * Pass $username and $password to \wp_authenticate() and expect it to die.
+     *
+     * @param string $username
+     * @param string $password
+     */
+    private function authenticateShouldDie(string $username, string $password): void
+    {
+        $exception = null;
+        try {
+            \wp_authenticate($username, $password);
+        } catch (\WPDieException $exception) {
+            $this->assertSame(503, $exception->getCode());
+        }
+        $this->assertInstanceOf(\WPDieException::class, $exception);
+    }
+
+
+    /**
+     * Pass $username and $password to \wp_authenticate() and expect it succeed.
+     *
+     * @param string $username
+     * @param string $password
+     */
+    private function authenticateShouldPass(string $username, string $password): void
+    {
+        $this->assertInstanceOf(\WP_User::class, \wp_authenticate($username, $password));
+    }
+}
diff --git a/tests/integration/src/Cases/PluginTest.php b/tests/integration/src/Cases/PluginTest.php
deleted file mode 100644
index 2936e1d..0000000
--- a/tests/integration/src/Cases/PluginTest.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-namespace BlueChip\Security\Tests\Integration\Cases;
-
-use BlueChip\Security\Plugin;
-
-class PluginTest extends \BlueChip\Security\Tests\Integration\TestCase
-{
-    /**
-     * @var \BlueChip\Security\Plugin
-     */
-    protected $bc_security;
-
-    /**
-     * Setup test.
-     */
-    public function setUp()
-    {
-        global $wpdb;
-
-        parent::setUp();
-
-        $this->bc_security = new Plugin('', $wpdb);
-    }
-
-    /**
-     * Test class instances.
-     */
-    public function testInstances()
-    {
-        $this->assertInstanceOf(Plugin::class, $this->bc_security);
-        $this->assertInstanceOf(\wpdb::class, $this->readAttribute($this->bc_security, 'wpdb'));
-    }
-}
diff --git a/tests/integration/src/Constants.php b/tests/integration/src/Constants.php
index 5d8388b..ecd70cb 100644
--- a/tests/integration/src/Constants.php
+++ b/tests/integration/src/Constants.php
@@ -7,6 +7,11 @@
  */
 abstract class Constants
 {
+    /**
+     * @var string Password assigned to mocked WP_User instances by WordPress test suite.
+     */
+    public const FACTORY_PASSWORD = 'password';
+
     /**
      * @var string Password that definitely have been pwned.
      */
diff --git a/tests/integration/src/TestCase.php b/tests/integration/src/TestCase.php
index e86cbd9..ec98f00 100644
--- a/tests/integration/src/TestCase.php
+++ b/tests/integration/src/TestCase.php
@@ -2,7 +2,35 @@
 
 namespace BlueChip\Security\Tests\Integration;
 
-class TestCase extends \WP_UnitTestCase
+use BlueChip\Security\Plugin;
+
+/**
+ * Base class for all integration tests
+ */
+abstract class TestCase extends \WP_UnitTestCase
 {
+    /**
+     * Allow to load the plugin with context customised for particular test suite.
+     */
+    public function setUp(): void
+    {
+        global $wpdb;
+
+        parent::setUp(); // !
+
+        // Prepare test: change plugin settings etc.
+        $this->prepareTest();
+
+        // Load the plugin.
+        (new Plugin(Bootstrap::getPluginRootDirectory(), $wpdb))->load();
+    }
+
 
+    /**
+     * Method is executed in setup phase of every test just before the plugin is loaded.
+     */
+    protected function prepareTest(): void
+    {
+        // Empty by default, can be overriden in descendants.
+    }
 }
diff --git a/tests/unit/bootstrap.php b/tests/unit/bootstrap.php
deleted file mode 100644
index d78e909..0000000
--- a/tests/unit/bootstrap.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-/**
- * PHPUnit bootstrap file for unit tests
- */
-
-// Require Composer autoloader.
-require_once dirname(dirname(__DIR__)) . '/vendor/autoload.php';
-
-(new \BlueChip\Security\Tests\Unit\Bootstrap())->run();
diff --git a/tests/unit/phpunit.xml b/tests/unit/phpunit.xml
index 61fdd72..f70e394 100644
--- a/tests/unit/phpunit.xml
+++ b/tests/unit/phpunit.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit
-	bootstrap="./bootstrap.php"
 	backupGlobals="false"
 	cacheResult="false"
 	colors="true"
diff --git a/tests/unit/src/Bootstrap.php b/tests/unit/src/Bootstrap.php
deleted file mode 100644
index 95bdd57..0000000
--- a/tests/unit/src/Bootstrap.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-namespace BlueChip\Security\Tests\Unit;
-
-class Bootstrap
-{
-    public function run()
-    {
-    }
-}
diff --git a/tests/unit/src/Cases/Helpers/IsTest.php b/tests/unit/src/Cases/Helpers/IsTest.php
index f6ec4f9..b6457b4 100644
--- a/tests/unit/src/Cases/Helpers/IsTest.php
+++ b/tests/unit/src/Cases/Helpers/IsTest.php
@@ -12,7 +12,7 @@ class IsTest extends \BlueChip\Security\Tests\Unit\TestCase
     /**
      * Ensure that `bc-security/filter:is-admin` fires when Is::admin() method is invoked.
      */
-    public function testIsAdminHookFires()
+    public function testIsAdminHookFires(): void
     {
         Functions\when('user_can')->justReturn(true);
 
@@ -26,7 +26,7 @@ public function testIsAdminHookFires()
      * Ensure that `bc-security/filter:is-admin` filters return value of Is::admin() and
      * passes \WP_User instance as its second argument.
      */
-    public function testIsAdminFilter()
+    public function testIsAdminFilter(): void
     {
         $user = \Mockery::mock(\WP_User::class);
 
diff --git a/tests/unit/src/Cases/Helpers/PluginTest.php b/tests/unit/src/Cases/Helpers/PluginTest.php
index 1f30347..4f8b9f5 100644
--- a/tests/unit/src/Cases/Helpers/PluginTest.php
+++ b/tests/unit/src/Cases/Helpers/PluginTest.php
@@ -32,7 +32,7 @@ public function provideWordPressOrgUriData(): array
      *
      * @dataProvider provideWordPressOrgUriData
      */
-    public function testHasWordPressOrgUpdateUri(bool $value, string $plugin_basename, array $plugin_data)
+    public function testHasWordPressOrgUpdateUri(bool $value, string $plugin_basename, array $plugin_data): void
     {
         $this->assertSame($value, Plugin::hasWordPressOrgUpdateUri($plugin_basename, $plugin_data));
     }
diff --git a/tests/unit/src/Cases/Modules/Log/EventsManagerTest.php b/tests/unit/src/Cases/Modules/Log/EventsManagerTest.php
index b05d08d..7eb1f5c 100644
--- a/tests/unit/src/Cases/Modules/Log/EventsManagerTest.php
+++ b/tests/unit/src/Cases/Modules/Log/EventsManagerTest.php
@@ -9,7 +9,7 @@ class EventsManagerTest extends \BlueChip\Security\Tests\Unit\TestCase
     /**
      * Ensure that mapping from event ID to event class is sane.
      */
-    public function testMapping()
+    public function testMapping(): void
     {
         $events = Log\EventsManager::getMapping();
 
diff --git a/tests/unit/src/Cases/Modules/Log/EventsMonitorTest.php b/tests/unit/src/Cases/Modules/Log/EventsMonitorTest.php
index 1b5685f..90b6235 100644
--- a/tests/unit/src/Cases/Modules/Log/EventsMonitorTest.php
+++ b/tests/unit/src/Cases/Modules/Log/EventsMonitorTest.php
@@ -21,7 +21,7 @@ protected function setUp(): void
     }
 
 
-    public function testBadCookie()
+    public function testBadCookie(): void
     {
         Actions\expectDone(Log\Action::EVENT)->once()->with(\Mockery::type(Log\Events\AuthBadCookie::class));
 
@@ -29,7 +29,7 @@ public function testBadCookie()
     }
 
 
-    public function testFailedLogin()
+    public function testFailedLogin(): void
     {
         Actions\expectDone(Log\Action::EVENT)->once()->with(\Mockery::type(Log\Events\LoginFailure::class));
         $wp_error = \Mockery::mock(\WP_Error::class);
@@ -42,7 +42,7 @@ public function testFailedLogin()
     }
 
 
-    public function testLoginLockout()
+    public function testLoginLockout(): void
     {
         Actions\expectDone(Log\Action::EVENT)->once()->with(\Mockery::type(Log\Events\LoginLockout::class));
 
@@ -50,7 +50,7 @@ public function testLoginLockout()
     }
 
 
-    public function testSuccessfulLogin()
+    public function testSuccessfulLogin(): void
     {
         Actions\expectDone(Log\Action::EVENT)->once()->with(\Mockery::type(Log\Events\LoginSuccessful::class));
 
diff --git a/tests/unit/src/Cases/Modules/Log/EventsTest.php b/tests/unit/src/Cases/Modules/Log/EventsTest.php
index 119594b..ca66c02 100644
--- a/tests/unit/src/Cases/Modules/Log/EventsTest.php
+++ b/tests/unit/src/Cases/Modules/Log/EventsTest.php
@@ -9,7 +9,7 @@ class EventsTest extends \BlueChip\Security\Tests\Unit\TestCase
     /**
      * Ensure that every event type (class) has the necessary constants: ID and LEVEL.
      */
-    public function testConstants()
+    public function testConstants(): void
     {
         $event_classes = Log\EventsManager::getMapping();
 
@@ -25,7 +25,7 @@ public function testConstants()
     /**
      * Ensure that only PSR-4 compliant log levels are reported by events.
      */
-    public function testLogLevels()
+    public function testLogLevels(): void
     {
         $reflection = new \ReflectionClass(\Psr\Log\LogLevel::class);
         $log_levels = $reflection->getConstants();
@@ -40,7 +40,7 @@ public function testLogLevels()
     /**
      * Ensure that event log message references only available context data.
      */
-    public function testLogMessages()
+    public function testLogMessages(): void
     {
         $event_instances = Log\EventsManager::getInstances();
         foreach ($event_instances as $event) {
@@ -65,7 +65,7 @@ public function testLogMessages()
     /**
      * Ensure that there are no context items without label.
      */
-    public function testContextLabels()
+    public function testContextLabels(): void
     {
         $event_instances = Log\EventsManager::getInstances();
         foreach ($event_instances as $event) {
diff --git a/tests/unit/src/Cases/Setup/IpAddressTest.php b/tests/unit/src/Cases/Setup/IpAddressTest.php
index 151e1c6..bcac727 100644
--- a/tests/unit/src/Cases/Setup/IpAddressTest.php
+++ b/tests/unit/src/Cases/Setup/IpAddressTest.php
@@ -43,7 +43,7 @@ public function provideRemoteAddressGetterData(): array
     /**
      * @dataProvider provideRemoteAddressGetterData
      */
-    public function testRemoteAddressGetter($connection_type, $ip_address)
+    public function testRemoteAddressGetter(string $connection_type, string $ip_address): void
     {
         $this->assertSame($ip_address, IpAddress::get($connection_type));
     }
@@ -63,7 +63,7 @@ public function provideRemoteAddressGetterFallbackData(): array
      * Test the case when connection type is set to proxy, but there is actually no proxy info.
      * @dataProvider provideRemoteAddressGetterFallbackData
      */
-    public function testRemoteAddressGetterFallback($connection_type, $ip_address)
+    public function testRemoteAddressGetterFallback(string $connection_type, string $ip_address): void
     {
         // Make sure the requested connection info is empty.
         unset($_SERVER[$connection_type]);
@@ -87,7 +87,7 @@ public function provideRawRemoteAddressGetterData(): array
     /**
      * @dataProvider provideRawRemoteAddressGetterData
      */
-    public function testRemoteRawAddressGetter($connection_type, $ip_address)
+    public function testRemoteRawAddressGetter(string $connection_type, string $ip_address): void
     {
         $this->assertSame($ip_address, IpAddress::getRaw($connection_type));
     }
diff --git a/tests/unit/src/TestCase.php b/tests/unit/src/TestCase.php
index ebd08b3..f5c7f41 100644
--- a/tests/unit/src/TestCase.php
+++ b/tests/unit/src/TestCase.php
@@ -9,6 +9,7 @@ class TestCase extends \PHPUnit\Framework\TestCase
     // See: https://github.com/Brain-WP/BrainMonkey/issues/39
     use \Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration;
 
+
     protected function setUp(): void
     {
         parent::setUp();
@@ -33,6 +34,7 @@ protected function setUp(): void
         );
     }
 
+
     protected function tearDown(): void
     {
         Monkey\tearDown();
diff --git a/uninstall.php b/uninstall.php
index 0b7265c..d567f55 100644
--- a/uninstall.php
+++ b/uninstall.php
@@ -14,7 +14,5 @@
 // Register autoloader for this plugin.
 require_once __DIR__ . '/autoload.php';
 
-// Construct plugin instance.
-$bc_security = new \BlueChip\Security\Plugin(__DIR__ . '/bc-security.php', $GLOBALS['wpdb']);
-// Run uninstall actions.
-$bc_security->uninstall();
+// Construct plugin instance and run uninstall actions.
+(new \BlueChip\Security\Plugin(__DIR__ . '/bc-security.php', $GLOBALS['wpdb']))->uninstall();