diff --git a/includes/admin/class-wc-postfinancecheckout-admin.php b/includes/admin/class-wc-postfinancecheckout-admin.php
index 036b769..d81346c 100644
--- a/includes/admin/class-wc-postfinancecheckout-admin.php
+++ b/includes/admin/class-wc-postfinancecheckout-admin.php
@@ -352,51 +352,50 @@ public function store_attribute_options( $product, $data_storage ) { //phpcs:ign
 	 * Display attribute options edit screen
 	 */
 	public function display_attribute_options_edit() {
-		if ( ! isset( $_GET['edit'] ) ) {// phpcs:ignore
+		if ( ! isset( $_GET['edit'] ) ) {
 			return;
 		} else {
-			$edit = esc_url_raw( wp_unslash( $_GET['edit'] ) );// phpcs:ignore
+			$edit = absint( $_GET['edit'] );
 		}
-		$edit = absint( $edit );
 		$checked = false;
 		$attribute_options = WC_PostFinanceCheckout_Entity_Attribute_Options::load_by_attribute_id( $edit );
 		if ( $attribute_options->get_id() > 0 && $attribute_options->get_send() ) {
 			$checked = true;
 		}
-		echo esc_html(
-			'<tr class="form-field form-required">
-					<th scope="row" valign="top">
-							<label for="postfinancecheckout_attribute_option_send">'
-			) . esc_html__( 'Send attribute to PostFinance Checkout.', 'woo-postfinancecheckout' ) . esc_html(
-						'</label>
-					</th>
-						<td>
-								<input name="postfinancecheckout_attribute_option_send" id="postfinancecheckout_attribute_option_send" type="checkbox" value="1" '
-			) . esc_attr( checked( $checked, true, false ) ) . esc_html(
-							'/>
-							<p class="description">'
-			) . esc_html__( 'Should this product attribute be sent to PostFinance Checkout as line item attribute?', 'woo-postfinancecheckout' ) . esc_html(
-							'</p>
-						</td>
-				</tr>'
-			);
+		?>
+		<tr class="form-field form-required">
+			<th scope="row" valign="top">
+				<label for="postfinancecheckout_attribute_option_send">
+					<?php esc_html_e( 'Send attribute to PostFinance Checkout.', 'woo-postfinancecheckout' ); ?>
+				</label>
+			</th>
+			<td>
+				<input name="postfinancecheckout_attribute_option_send" id="postfinancecheckout_attribute_option_send" type="checkbox" value="1" <?php checked( $checked, true ); ?> />
+				<p class="description">
+					<?php esc_html_e( 'Should this product attribute be sent to PostFinance Checkout as line item attribute?', 'woo-postfinancecheckout' ); ?>
+				</p>
+			</td>
+		</tr>
+		<?php
 	}
+	
+
 
 	/**
 	 * Display attribute options add screen
 	 */
 	public function display_attribute_options_add() {
-		echo esc_html(
-			'<div class="form-field">
-				<label for="postfinancecheckout_attribute_option_send"><input name="postfinancecheckout_attribute_option_send" id="postfinancecheckout_attribute_option_send" type="checkbox" value="1">'
-		) . esc_html__( 'Send attribute to PostFinance Checkout.', 'woo-postfinancecheckout' ) . esc_html(
-				'</label>
-				<p class="description">'
-		) . esc_html__( 'Should this product attribute be sent to PostFinance Checkout as line item attribute?', 'woo-postfinancecheckout' ) .
-		esc_html(
-				'</p>
-			</div>'
-		);
+		?>
+		<div class="form-field">
+			<label for="postfinancecheckout_attribute_option_send">
+				<input name="postfinancecheckout_attribute_option_send" id="postfinancecheckout_attribute_option_send" type="checkbox" value="1">
+				<?php esc_html_e( 'Send attribute to PostFinance Checkout.', 'woo-postfinancecheckout' ); ?>
+			</label>
+			<p class="description">
+				<?php esc_html_e( 'Should this product attribute be sent to PostFinance Checkout as line item attribute?', 'woo-postfinancecheckout' ); ?>
+			</p>
+		</div>
+		<?php
 	}
 }
 
diff --git a/includes/class-wc-postfinancecheckout-gateway.php b/includes/class-wc-postfinancecheckout-gateway.php
index 5dc2861..0813568 100644
--- a/includes/class-wc-postfinancecheckout-gateway.php
+++ b/includes/class-wc-postfinancecheckout-gateway.php
@@ -273,42 +273,44 @@ public function init_form_fields() {
 	public function generate_info_html( $key, $data ) {
 		$field_key = $this->get_field_key( $key );
 		$defaults = array(
-			'title' => '',
-			'class' => '',
-			'css' => '',
-			'placeholder' => '',
-			'desc_tip' => true,
-			'description' => '',
+			'title'             => '',
+			'class'             => '',
+			'css'               => '',
+			'placeholder'       => '',
+			'desc_tip'          => true,
+			'description'       => '',
 			'custom_attributes' => array(),
 		);
-
+	
 		$data = wp_parse_args( $data, $defaults );
-
+	
 		ob_start();
 		?>
-<tr valign="top">
-	<th scope="row" class="titledesc">
-							<?php // phpcs:ignore ?>
-							<?php echo esc_html( $this->get_tooltip_html( $data ) ); ?>
-							<label for="<?php echo esc_attr( $field_key ); ?>"><?php echo wp_kses_post( $data['title'] ); ?></label>
-	</th>
-	<td class="forminp">
-		<fieldset>
-			<legend class="screen-reader-text">
-				<span><?php echo wp_kses_post( $data['title'] ); ?></span>
-			</legend>
-			<div class="input-text regular-input <?php echo esc_attr( $data['class'] ); ?>" id="<?php echo esc_attr( $field_key ); ?>" style="<?php echo esc_attr( $data['css'] ); ?>" <?php echo esc_html( $this->get_custom_attribute_html( $data ) ); ?> >
-								<?php echo esc_html( $data['value'] ); ?>
-						</div>
-		</fieldset>
-	</td>
-</tr>
+	<tr valign="top">
+		<th scope="row" class="titledesc">
+			<?php echo $this->get_tooltip_html( $data ); // Output the tooltip HTML directly ?>
+			<label for="<?php echo esc_attr( $field_key ); ?>"><?php echo esc_html( $data['title'] ); ?></label>
+		</th>
+		<td class="forminp">
+			<fieldset>
+				<legend class="screen-reader-text">
+					<span><?php echo esc_html( $data['title'] ); ?></span>
+				</legend>
+				<div
+					class="input-text regular-input <?php echo esc_attr( $data['class'] ); ?>"
+					id="<?php echo esc_attr( $field_key ); ?>"
+					style="<?php echo esc_attr( $data['css'] ); ?>"
+					<?php echo $this->get_custom_attribute_html( $data ); // Output custom attributes ?>
+				>
+					<?php echo wp_kses_post( $data['value'] ); ?>
+				</div>
+			</fieldset>
+		</td>
+	</tr>
 		<?php
-
+	
 		return ob_get_clean();
-	}
-
-	/**
+	}	/**
 	 * Validate Info Field.
 	 *
 	 * @param  string      $key Field key++.