diff --git a/modules/ppcp-paypal-subscriptions/resources/js/paypal-subscription.js b/modules/ppcp-paypal-subscriptions/resources/js/paypal-subscription.js
index 6435f8b0a..f8a9df72f 100644
--- a/modules/ppcp-paypal-subscriptions/resources/js/paypal-subscription.js
+++ b/modules/ppcp-paypal-subscriptions/resources/js/paypal-subscription.js
@@ -70,45 +70,37 @@ document.addEventListener( 'DOMContentLoaded', () => {
 		soldIndividually.setAttribute( 'disabled', 'disabled' );
 	};
 
+    const checkSubscriptionPeriodsInterval = (period, period_interval, linkBtn) => {
+        if (
+            ( period === 'year' && parseInt( period_interval ) > 1 ) ||
+            ( period === 'month' && parseInt( period_interval ) > 12 ) ||
+            ( period === 'week' && parseInt( period_interval ) > 52 ) ||
+            ( period === 'day' && parseInt( period_interval ) > 356 )
+        ) {
+            linkBtn.disabled = true;
+            linkBtn.checked = false;
+            linkBtn.setAttribute('title', __( 'Not allowed period intervall combination!', 'woocommerce-paypal-subscriptions' ) );
+        } else {
+            linkBtn.disabled = false;
+            linkBtn.removeAttribute('title');
+        }
+    }
+
 	const setupProducts = () => {
         jQuery( '.wc_input_subscription_period' ).on( 'change', (e) => {
-            const linkBtn = e.target.parentElement.parentElement.parentElement.parentElement.querySelector('input[name="_ppcp_enable_subscription_product"]');
+            const linkBtn = e.target.parentElement.parentElement.parentElement.querySelector('input[name="_ppcp_enable_subscription_product"]');
             const period_interval = e.target.parentElement.querySelector('select.wc_input_subscription_period_interval')?.value;
             const period = e.target.value;
 
-            if (
-                ( period === 'year' && parseInt( period_interval ) > 1 ) ||
-                ( period === 'month' && parseInt( period_interval ) > 12 ) ||
-                ( period === 'week' && parseInt( period_interval ) > 52 ) ||
-                ( period === 'day' && parseInt( period_interval ) > 356 )
-            ) {
-                linkBtn.disabled = true;
-                linkBtn.checked = false;
-                linkBtn.setAttribute('title', __( 'Not allowed period intervall combination!', 'woocommerce-paypal-subscriptions' ) );
-            } else {
-                linkBtn.disabled = false;
-                linkBtn.removeAttribute('title');
-            }
+            checkSubscriptionPeriodsInterval(period, period_interval, linkBtn);
         });
 
         jQuery( '.wc_input_subscription_period_interval' ).on( 'change', (e) => {
-            const linkBtn = e.target.parentElement.parentElement.parentElement.parentElement.querySelector('input[name="_ppcp_enable_subscription_product"]');
+            const linkBtn = e.target.parentElement.parentElement.parentElement.querySelector('input[name="_ppcp_enable_subscription_product"]');
             const period_interval = e.target.value;
             const period = e.target.parentElement.querySelector('select.wc_input_subscription_period')?.value;
 
-            if (
-                ( period === 'year' && parseInt( period_interval ) > 1 ) ||
-                ( period === 'month' && parseInt( period_interval ) > 12 ) ||
-                ( period === 'week' && parseInt( period_interval ) > 52 ) ||
-                ( period === 'day' && parseInt( period_interval ) > 356 )
-            ) {
-                linkBtn.disabled = true;
-                linkBtn.checked = false;
-                linkBtn.setAttribute('title', __( 'Not allowed period intervall combination!', 'woocommerce-paypal-subscriptions' ) );
-            } else {
-                linkBtn.disabled = false;
-                linkBtn.removeAttribute('title');
-            }
+            checkSubscriptionPeriodsInterval(period, period_interval, linkBtn);
         });
 
 		PayPalCommerceGatewayPayPalSubscriptionProducts?.forEach(
diff --git a/modules/ppcp-paypal-subscriptions/src/PayPalSubscriptionsModule.php b/modules/ppcp-paypal-subscriptions/src/PayPalSubscriptionsModule.php
index 5ae2bdc52..de68833f2 100644
--- a/modules/ppcp-paypal-subscriptions/src/PayPalSubscriptionsModule.php
+++ b/modules/ppcp-paypal-subscriptions/src/PayPalSubscriptionsModule.php
@@ -805,7 +805,6 @@ class PayPalSubscriptionsModule implements ServiceModule, ExtendingModule, Execu
 			echo sprintf(
 			// translators: %1$s and %2$s are button and wrapper html tags.
 				esc_html__( '%1$sUnlink PayPal Subscription Plan%2$s', 'woocommerce-paypal-payments' ),
-				//
 				'<p class="form-field ppcp-enable-subscription" id="ppcp-enable-subscription-' . esc_attr( (string) $product->get_id() ) . '" style="' . esc_attr( $display_unlink_p ) . '"><label></label><button class="button ppcp-unlink-sub-plan" id="ppcp-unlink-sub-plan-' . esc_attr( (string) $product->get_id() ) . '">',
 				'</button><span class="spinner is-active" id="spinner-unlink-plan" style="float: none; display:none;"></span></p>'
 			);