diff --git a/classes/Avif/ServiceProvider.php b/classes/Avif/ServiceProvider.php
index d78e52024..38b33a73b 100644
--- a/classes/Avif/ServiceProvider.php
+++ b/classes/Avif/ServiceProvider.php
@@ -6,6 +6,9 @@
 use Imagify\Dependencies\League\Container\ServiceProvider\AbstractServiceProvider;
 use Imagify\Avif\RewriteRules\Display as RewriteRules;
 
+/**
+ * Service provider for AVIF rewrite rules
+ */
 class ServiceProvider extends AbstractServiceProvider {
 	/**
 	 * Services provided by this provider
diff --git a/classes/CDN/CDN.php b/classes/CDN/CDN.php
index 5c5e2c782..8c21525f2 100644
--- a/classes/CDN/CDN.php
+++ b/classes/CDN/CDN.php
@@ -5,6 +5,9 @@
 
 use Imagify\EventManagement\SubscriberInterface;
 
+/**
+ * CDN subscriber
+ */
 class CDN implements SubscriberInterface {
 	/**
 	 * Array of events this subscriber listens to
diff --git a/classes/CDN/ServiceProvider.php b/classes/CDN/ServiceProvider.php
index c5f080c05..094900d35 100644
--- a/classes/CDN/ServiceProvider.php
+++ b/classes/CDN/ServiceProvider.php
@@ -5,6 +5,9 @@
 
 use Imagify\Dependencies\League\Container\ServiceProvider\AbstractServiceProvider;
 
+/**
+ * Service provider for CDN compatibility
+ */
 class ServiceProvider extends AbstractServiceProvider {
 	/**
 	 * Services provided by this provider
diff --git a/classes/Picture/Display.php b/classes/Picture/Display.php
index 5a37dd46a..eb9e9be2a 100644
--- a/classes/Picture/Display.php
+++ b/classes/Picture/Display.php
@@ -28,6 +28,8 @@ class Display implements SubscriberInterface {
 
 	/**
 	 * Constructor.
+	 *
+	 * @param Imagify_Filesystem $filesystem Filesystem instance.
 	 */
 	public function __construct( Imagify_Filesystem $filesystem ) {
 		$this->filesystem = $filesystem;
@@ -65,7 +67,7 @@ public function start_content_process() {
 			return;
 		}
 
-		$allow = apply_filters_deprecated( 'imagify_allow_picture_tags_for_webp', [true ], '2.2', 'imagify_allow_picture_tags_for_nextgen' );
+		$allow = apply_filters_deprecated( 'imagify_allow_picture_tags_for_webp', [ true ], '2.2', 'imagify_allow_picture_tags_for_nextgen' );
 
 		/**
 		 * Prevent the replacement of <img> tags into <picture> tags.
@@ -246,7 +248,7 @@ protected function build_picture_tag( $image ) {
 	protected function build_source_tag( $image ) {
 		$source = '';
 
-		foreach ( [ 'avif', 'webp'  ] as $image_type ) {
+		foreach ( [ 'avif', 'webp' ] as $image_type ) {
 			$attributes = $this->build_source_attributes( $image, $image_type );
 
 			if ( empty( $attributes ) ) {
diff --git a/classes/Picture/ServiceProvider.php b/classes/Picture/ServiceProvider.php
index bf15f799f..1e1f6efca 100644
--- a/classes/Picture/ServiceProvider.php
+++ b/classes/Picture/ServiceProvider.php
@@ -5,6 +5,9 @@
 
 use Imagify\Dependencies\League\Container\ServiceProvider\AbstractServiceProvider;
 
+/**
+ * Service provider for Picture display
+ */
 class ServiceProvider extends AbstractServiceProvider {
 	/**
 	 * Services provided by this provider
diff --git a/classes/Plugin.php b/classes/Plugin.php
index 4a5c2ba70..f1962a283 100644
--- a/classes/Plugin.php
+++ b/classes/Plugin.php
@@ -78,7 +78,7 @@ private function is_loaded(): bool {
 	/**
 	 * Plugin init.
 	 *
-	 * @param array Array of service providers.
+	 * @param array $providers Array of service providers.
 	 *
 	 * @since 1.9
 	 */
@@ -243,7 +243,7 @@ public function maybe_activate() {
 	/**
 	 * Load list of event subscribers from service provider.
 	 *
-	 * @param ServiceProviderInterface $service_provider_instance Instance of service provider.
+	 * @param ServiceProviderInterface $service_provider Instance of service provider.
 	 *
 	 * @return void
 	 */
diff --git a/classes/Webp/ServiceProvider.php b/classes/Webp/ServiceProvider.php
index d84ee776c..12d45ddfa 100644
--- a/classes/Webp/ServiceProvider.php
+++ b/classes/Webp/ServiceProvider.php
@@ -6,6 +6,9 @@
 use Imagify\Dependencies\League\Container\ServiceProvider\AbstractServiceProvider;
 use Imagify\Webp\RewriteRules\Display as RewriteRules;
 
+/**
+ * Service provider for WebP rewrite rules
+ */
 class ServiceProvider extends AbstractServiceProvider {
 	/**
 	 * Services provided by this provider