diff --git a/classes/helpers/FrmAppHelper.php b/classes/helpers/FrmAppHelper.php
index 19a301f4e7..ef97802b1e 100644
--- a/classes/helpers/FrmAppHelper.php
+++ b/classes/helpers/FrmAppHelper.php
@@ -1959,31 +1959,32 @@ public static function maybe_autocomplete_options( $args ) {
 				<?php endforeach; ?>
 			</select>
 			<?php
-		} else {
-			$options            = array();
-			$autocomplete_value = '';
+			return;
+		}
 
-			foreach ( $args['source'] as $key => $source ) {
-				$value_label = self::get_dropdown_value_and_label_from_option( $source, $key, $args );
+		$options            = array();
+		$autocomplete_value = '';
 
-				if ( $value_label['value'] === $args['selected'] ) {
-					$autocomplete_value = $value_label['label'];
-				}
+		foreach ( $args['source'] as $key => $source ) {
+			$value_label = self::get_dropdown_value_and_label_from_option( $source, $key, $args );
 
-				$options[] = $value_label;
+			if ( $value_label['value'] === $args['selected'] ) {
+				$autocomplete_value = $value_label['label'];
 			}
 
-			$html_attrs['type']  = 'hidden';
-			$html_attrs['class'] = 'frm_autocomplete_value_input';
-			$html_attrs['value'] = $args['selected'];
-			?>
-			<input type="text" class="frm-custom-search"
-				   data-source="<?php echo esc_attr( wp_json_encode( $options ) ); ?>"
-				   placeholder="<?php echo esc_attr( $args['autocomplete_placeholder'] ); ?>"
-				   value="<?php echo esc_attr( $autocomplete_value ); ?>" />
-			<input <?php self::array_to_html_params( $html_attrs, true ); ?> />
-			<?php
-		}//end if
+			$options[] = $value_label;
+		}
+
+		$html_attrs['type']  = 'hidden';
+		$html_attrs['class'] = 'frm_autocomplete_value_input';
+		$html_attrs['value'] = $args['selected'];
+		?>
+		<input type="text" class="frm-custom-search"
+			   data-source="<?php echo esc_attr( wp_json_encode( $options ) ); ?>"
+			   placeholder="<?php echo esc_attr( $args['autocomplete_placeholder'] ); ?>"
+			   value="<?php echo esc_attr( $autocomplete_value ); ?>" />
+		<input <?php self::array_to_html_params( $html_attrs, true ); ?> />
+		<?php
 	}
 
 	/**
@@ -3606,13 +3607,15 @@ private static function prepare_action_slashes( $val, $key, &$post_content ) {
 				self::prepare_action_slashes( $v1, $k1, $post_content[ $key ] );
 				unset( $k1, $v1 );
 			}
-		} else {
-			// Strip all slashes so everything is the same, no matter where the value is coming from
-			$val = stripslashes( $val );
 
-			// Add backslashes before double quotes and forward slashes only
-			$post_content[ $key ] = addcslashes( $val, '"\\/' );
+			return;
 		}
+
+		// Strip all slashes so everything is the same, no matter where the value is coming from
+		$val = stripslashes( $val );
+
+		// Add backslashes before double quotes and forward slashes only
+		$post_content[ $key ] = addcslashes( $val, '"\\/' );
 	}
 
 	/**
diff --git a/classes/helpers/FrmFieldsHelper.php b/classes/helpers/FrmFieldsHelper.php
index 6f25ac2cbe..4b19d38809 100644
--- a/classes/helpers/FrmFieldsHelper.php
+++ b/classes/helpers/FrmFieldsHelper.php
@@ -166,14 +166,16 @@ private static function prepare_front_field( &$field_array, $field, $args ) {
 			 * @param array      $args
 			 */
 			$field_array = apply_filters( 'frm_setup_edit_fields_vars', $field_array, $field, $args['entry_id'], $args );
-		} else {
-			/**
-			 * @param array      $field_array
-			 * @param stdClass   $field
-			 * @param array      $args
-			 */
-			$field_array = apply_filters( 'frm_setup_new_fields_vars', $field_array, $field, $args );
+
+			return;
 		}
+
+		/**
+		 * @param array      $field_array
+		 * @param stdClass   $field
+		 * @param array      $args
+		 */
+		$field_array = apply_filters( 'frm_setup_new_fields_vars', $field_array, $field, $args );
 	}
 
 	/**
diff --git a/classes/helpers/FrmXMLHelper.php b/classes/helpers/FrmXMLHelper.php
index fffb659c72..8896040477 100644
--- a/classes/helpers/FrmXMLHelper.php
+++ b/classes/helpers/FrmXMLHelper.php
@@ -919,27 +919,30 @@ private static function update_custom_style_setting_on_import( &$form ) {
 		if ( is_numeric( $form['options']['custom_style'] ) && 1 === intval( $form['options']['custom_style'] ) ) {
 			// Set to default
 			$form['options']['custom_style'] = 1;
-		} else {
-			// Replace the style name with the style ID on import
-			global $wpdb;
-			$table    = $wpdb->prefix . 'posts';
-			$where    = array(
-				'post_name' => $form['options']['custom_style'],
-				'post_type' => 'frm_styles',
-			);
-			$select   = 'ID';
-			$style_id = FrmDb::get_var( $table, $where, $select );
 
-			if ( $style_id ) {
-				$form['options']['custom_style'] = $style_id;
-			} else {
-				// save the old style to maybe update after styles import
-				$form['options']['old_style'] = $form['options']['custom_style'];
+			return;
+		}
 
-				// Set to default
-				$form['options']['custom_style'] = 1;
-			}
-		}//end if
+		// Replace the style name with the style ID on import
+		global $wpdb;
+		$table    = $wpdb->prefix . 'posts';
+		$where    = array(
+			'post_name' => $form['options']['custom_style'],
+			'post_type' => 'frm_styles',
+		);
+		$select   = 'ID';
+		$style_id = FrmDb::get_var( $table, $where, $select );
+
+		if ( $style_id ) {
+			$form['options']['custom_style'] = $style_id;
+			return;
+		}
+
+		// save the old style to maybe update after styles import
+		$form['options']['old_style'] = $form['options']['custom_style'];
+
+		// Set to default
+		$form['options']['custom_style'] = 1;
 	}
 
 	/**
@@ -1524,6 +1527,8 @@ private static function maybe_update_stylesheet( $imported ) {
 	 * @param mixed  $result
 	 * @param string $message
 	 * @param array  $errors
+	 *
+	 * @return void
 	 */
 	public static function parse_message( $result, &$message, &$errors ) {
 		if ( is_wp_error( $result ) ) {
@@ -1592,24 +1597,28 @@ public static function parse_message( $result, &$message, &$errors ) {
 		if ( $message === '<ul>' ) {
 			$message  = '';
 			$errors[] = __( 'Nothing was imported or updated', 'formidable' );
-		} else {
-			self::add_form_link_to_message( $result, $message );
 
-			/**
-			 * @since 5.3
-			 *
-			 * @param string $message
-			 * @param array  $result
-			 */
-			$message  = apply_filters( 'frm_xml_parsed_message', $message, $result );
-			$message .= '</ul>';
+			return;
 		}
+
+		self::add_form_link_to_message( $result, $message );
+
+		/**
+		 * @since 5.3
+		 *
+		 * @param string $message
+		 * @param array  $result
+		 */
+		$message  = apply_filters( 'frm_xml_parsed_message', $message, $result );
+		$message .= '</ul>';
 	}
 
 	/**
 	 * @param int           $m
 	 * @param string        $type
 	 * @param array<string> $s_message
+	 *
+	 * @return void
 	 */
 	public static function item_count_message( $m, $type, &$s_message ) {
 		if ( ! $m ) {
@@ -1637,19 +1646,20 @@ public static function item_count_message( $m, $type, &$s_message ) {
 
 		if ( isset( $strings[ $type ] ) ) {
 			$s_message[] = $strings[ $type ];
-		} else {
-			$string = ' ' . $m . ' ' . ucfirst( $type );
-
-			/**
-			 * @since 5.3
-			 *
-			 * @param string $string Message string for imported item.
-			 * @param int    $m      Number of item that was imported.
-			 * }
-			 */
-			$string      = apply_filters( 'frm_xml_' . $type . '_count_message', $string, $m );
-			$s_message[] = $string;
+			return;
 		}
+
+		$string = ' ' . $m . ' ' . ucfirst( $type );
+
+		/**
+		 * @since 5.3
+		 *
+		 * @param string $string Message string for imported item.
+		 * @param int    $m      Number of item that was imported.
+		 * }
+		 */
+		$string      = apply_filters( 'frm_xml_' . $type . '_count_message', $string, $m );
+		$s_message[] = $string;
 	}
 
 	/**
diff --git a/phpcs-sniffs/Formidable/Sniffs/CodeAnalysis/FlipIfElseToEarlyReturnSniff.php b/phpcs-sniffs/Formidable/Sniffs/CodeAnalysis/FlipIfElseToEarlyReturnSniff.php
index 9768a8b636..4a4ece980e 100644
--- a/phpcs-sniffs/Formidable/Sniffs/CodeAnalysis/FlipIfElseToEarlyReturnSniff.php
+++ b/phpcs-sniffs/Formidable/Sniffs/CodeAnalysis/FlipIfElseToEarlyReturnSniff.php
@@ -14,8 +14,9 @@
 use PHP_CodeSniffer\Files\File;
 
 /**
- * Converts if/else to early return in void functions.
+ * Converts if/else to early return in functions.
  *
+ * Case 1 - Void function, else is large:
  * Bad:
  * function example($value) {
  *     if ($condition) {
@@ -33,6 +34,28 @@
  *     }
  *     // 5+ lines of code
  * }
+ *
+ * Case 2 - Else ends with return, if doesn't:
+ * Bad:
+ * function example($value) {
+ *     $opt = 'create';
+ *     if ($condition) {
+ *         do_something();
+ *     } else {
+ *         // code that returns
+ *         return $result;
+ *     }
+ * }
+ *
+ * Good:
+ * function example($value) {
+ *     $opt = 'create';
+ *     if (! $condition) {
+ *         // code that returns
+ *         return $result;
+ *     }
+ *     do_something();
+ * }
  */
 class FlipIfElseToEarlyReturnSniff implements Sniff {
 
@@ -63,11 +86,6 @@ public function register() {
 	public function process( File $phpcsFile, $stackPtr ) {
 		$tokens = $phpcsFile->getTokens();
 
-		// Check if function returns void.
-		if ( ! $this->isVoidFunction( $phpcsFile, $stackPtr ) ) {
-			return;
-		}
-
 		// Get the function's scope opener and closer.
 		if ( ! isset( $tokens[ $stackPtr ]['scope_opener'] ) || ! isset( $tokens[ $stackPtr ]['scope_closer'] ) ) {
 			return;
@@ -76,36 +94,13 @@ public function process( File $phpcsFile, $stackPtr ) {
 		$funcOpener = $tokens[ $stackPtr ]['scope_opener'];
 		$funcCloser = $tokens[ $stackPtr ]['scope_closer'];
 
-		// Find the first non-whitespace, non-comment token inside the function.
-		$skipTokens = array(
-			T_WHITESPACE,
-			T_COMMENT,
-			T_DOC_COMMENT,
-			T_DOC_COMMENT_OPEN_TAG,
-			T_DOC_COMMENT_CLOSE_TAG,
-			T_DOC_COMMENT_STAR,
-			T_DOC_COMMENT_WHITESPACE,
-			T_DOC_COMMENT_STRING,
-			T_DOC_COMMENT_TAG,
-		);
-
-		$firstStatement = $funcOpener + 1;
+		// Find an if statement that has an else as the last thing in the function.
+		$ifToken = $this->findIfElseAtEndOfFunction( $phpcsFile, $funcOpener, $funcCloser );
 
-		while ( $firstStatement < $funcCloser && in_array( $tokens[ $firstStatement ]['code'], $skipTokens, true ) ) {
-			++$firstStatement;
-		}
-
-		if ( $firstStatement >= $funcCloser ) {
+		if ( false === $ifToken ) {
 			return;
 		}
 
-		// Check if the first statement is an if.
-		if ( $tokens[ $firstStatement ]['code'] !== T_IF ) {
-			return;
-		}
-
-		$ifToken = $firstStatement;
-
 		// Get the if's scope closer.
 		if ( ! isset( $tokens[ $ifToken ]['scope_closer'] ) ) {
 			return;
@@ -143,6 +138,38 @@ public function process( File $phpcsFile, $stackPtr ) {
 			return;
 		}
 
+		// Check if the else block ends with a return.
+		$elseEndsWithReturn = $this->blockEndsWithReturn( $phpcsFile, $elseToken );
+		$ifEndsWithReturn   = $this->blockEndsWithReturn( $phpcsFile, $ifToken );
+
+		// Case 1: Void function where else is large - add return to if, unwrap else.
+		// Case 2: Else ends with return, if doesn't - flip the condition.
+		if ( $elseEndsWithReturn && ! $ifEndsWithReturn ) {
+			// Case 2: Flip the if/else so else returns early.
+			$elseLineCount = $this->countLinesInScope( $phpcsFile, $elseOpener, $elseCloser );
+
+			if ( $elseLineCount < $this->minElseLines ) {
+				return;
+			}
+
+			$fix = $phpcsFile->addFixableError(
+				'Consider using early return pattern. Flip the condition so the else returns early.',
+				$elseToken,
+				'FlipElseReturn'
+			);
+
+			if ( true === $fix ) {
+				$this->applyFlipFix( $phpcsFile, $ifToken, $elseToken, $elseOpener, $elseCloser );
+			}
+
+			return;
+		}
+
+		// Case 1: Void function, else is large.
+		if ( ! $this->isVoidFunction( $phpcsFile, $stackPtr ) ) {
+			return;
+		}
+
 		// Count lines in the else block.
 		$elseLineCount = $this->countLinesInScope( $phpcsFile, $elseOpener, $elseCloser );
 
@@ -151,7 +178,7 @@ public function process( File $phpcsFile, $stackPtr ) {
 		}
 
 		// Check that the if block doesn't already end with return.
-		if ( $this->blockEndsWithReturn( $phpcsFile, $ifToken ) ) {
+		if ( $ifEndsWithReturn ) {
 			return;
 		}
 
@@ -166,6 +193,68 @@ public function process( File $phpcsFile, $stackPtr ) {
 		}
 	}
 
+	/**
+	 * Find an if statement with an else that is the last thing in the function.
+	 *
+	 * @param File $phpcsFile   The file being scanned.
+	 * @param int  $funcOpener  The function scope opener.
+	 * @param int  $funcCloser  The function scope closer.
+	 *
+	 * @return false|int The if token position, or false if not found.
+	 */
+	private function findIfElseAtEndOfFunction( File $phpcsFile, $funcOpener, $funcCloser ) {
+		$tokens = $phpcsFile->getTokens();
+
+		// Search backwards from the function closer to find the last if/else.
+		$current = $funcCloser - 1;
+
+		// Skip whitespace and comments.
+		while ( $current > $funcOpener && in_array( $tokens[ $current ]['code'], array( T_WHITESPACE, T_COMMENT ), true ) ) {
+			--$current;
+		}
+
+		// Should be a closing brace.
+		if ( $tokens[ $current ]['code'] !== T_CLOSE_CURLY_BRACKET ) {
+			return false;
+		}
+
+		// Find what this brace belongs to.
+		if ( ! isset( $tokens[ $current ]['scope_condition'] ) ) {
+			return false;
+		}
+
+		$scopeCondition = $tokens[ $current ]['scope_condition'];
+
+		// Must be an else.
+		if ( $tokens[ $scopeCondition ]['code'] !== T_ELSE ) {
+			return false;
+		}
+
+		// Find the if that this else belongs to.
+		$elseToken = $scopeCondition;
+
+		// Look backwards from the else to find the if's closing brace.
+		$beforeElse = $phpcsFile->findPrevious( T_WHITESPACE, $elseToken - 1, null, true );
+
+		if ( false === $beforeElse || $tokens[ $beforeElse ]['code'] !== T_CLOSE_CURLY_BRACKET ) {
+			return false;
+		}
+
+		// Find the if token.
+		if ( ! isset( $tokens[ $beforeElse ]['scope_condition'] ) ) {
+			return false;
+		}
+
+		$ifToken = $tokens[ $beforeElse ]['scope_condition'];
+
+		// Must be an if (not elseif).
+		if ( $tokens[ $ifToken ]['code'] !== T_IF ) {
+			return false;
+		}
+
+		return $ifToken;
+	}
+
 	/**
 	 * Check if a function is void (has @return void or no return with value).
 	 *
@@ -246,37 +335,56 @@ private function countLinesInScope( File $phpcsFile, $scopeOpener, $scopeCloser
 	/**
 	 * Check if a block ends with a return statement.
 	 *
-	 * @param File $phpcsFile The file being scanned.
-	 * @param int  $ifToken   The if token position.
+	 * @param File $phpcsFile  The file being scanned.
+	 * @param int  $blockToken The if or else token position.
 	 *
 	 * @return bool
 	 */
-	private function blockEndsWithReturn( File $phpcsFile, $ifToken ) {
+	private function blockEndsWithReturn( File $phpcsFile, $blockToken ) {
 		$tokens = $phpcsFile->getTokens();
 
-		if ( ! isset( $tokens[ $ifToken ]['scope_closer'] ) ) {
+		if ( ! isset( $tokens[ $blockToken ]['scope_closer'] ) ) {
 			return false;
 		}
 
-		$scopeCloser = $tokens[ $ifToken ]['scope_closer'];
+		$scopeCloser = $tokens[ $blockToken ]['scope_closer'];
+		$scopeOpener = $tokens[ $blockToken ]['scope_opener'];
 
 		// Find the last non-whitespace token before the closing brace.
-		$lastToken = $phpcsFile->findPrevious( T_WHITESPACE, $scopeCloser - 1, null, true );
+		$lastToken = $phpcsFile->findPrevious( T_WHITESPACE, $scopeCloser - 1, $scopeOpener, true );
 
 		if ( false === $lastToken ) {
 			return false;
 		}
 
-		// Check if it's a semicolon after a return.
-		if ( $tokens[ $lastToken ]['code'] === T_SEMICOLON ) {
-			$beforeSemi = $phpcsFile->findPrevious( T_WHITESPACE, $lastToken - 1, null, true );
+		// Check if it's a semicolon.
+		if ( $tokens[ $lastToken ]['code'] !== T_SEMICOLON ) {
+			return false;
+		}
+
+		// Find the statement before the semicolon.
+		$statementEnd = $lastToken - 1;
 
-			if ( false !== $beforeSemi && $tokens[ $beforeSemi ]['code'] === T_RETURN ) {
-				return true;
-			}
+		// Skip whitespace.
+		while ( $statementEnd > $scopeOpener && $tokens[ $statementEnd ]['code'] === T_WHITESPACE ) {
+			--$statementEnd;
 		}
 
-		return false;
+		// Look for a return token on this statement's line or find the return keyword.
+		$returnToken = $phpcsFile->findPrevious(
+			T_RETURN,
+			$lastToken - 1,
+			$scopeOpener
+		);
+
+		if ( false === $returnToken ) {
+			return false;
+		}
+
+		// Make sure the return is on the same statement (no semicolons between return and our semicolon).
+		$semiCheck = $phpcsFile->findNext( T_SEMICOLON, $returnToken + 1, $lastToken );
+
+		return false === $semiCheck;
 	}
 
 	/**
@@ -334,9 +442,14 @@ private function applyFix( File $phpcsFile, $ifToken, $elseToken, $elseOpener, $
 			true
 		);
 
-		// Add return; before the if's closing brace.
+		// Clear tokens between last statement and closing brace, then add return with proper formatting.
+		for ( $i = $lastInIf + 1; $i < $ifCloser; $i++ ) {
+			$fixer->replaceToken( $i, '' );
+		}
+
+		// Add return; after the last statement, with newline so brace is on its own line.
 		if ( false !== $lastInIf ) {
-			$fixer->addContent( $lastInIf, $phpcsFile->eolChar . $phpcsFile->eolChar . $innerIndent . 'return;' );
+			$fixer->addContent( $lastInIf, $phpcsFile->eolChar . $phpcsFile->eolChar . $innerIndent . 'return;' . $phpcsFile->eolChar . $ifIndent );
 		}
 
 		// Remove everything from after the if's closing brace to the function's closing brace.
@@ -346,11 +459,116 @@ private function applyFix( File $phpcsFile, $ifToken, $elseToken, $elseOpener, $
 		}
 
 		// Add the dedented else body after the if's closing brace.
-		$fixer->addContent( $ifCloser, $phpcsFile->eolChar . $phpcsFile->eolChar . $ifIndent . ltrim( $elseBodyContent ) );
+		// Get function indentation for the closing brace (one level less than if).
+		$funcIndent = $this->getIndentation( $phpcsFile, $funcCloser );
+		$fixer->addContent( $ifCloser, $phpcsFile->eolChar . $phpcsFile->eolChar . $ifIndent . ltrim( rtrim( $elseBodyContent ) ) . $phpcsFile->eolChar . $funcIndent );
+
+		$fixer->endChangeset();
+	}
+
+	/**
+	 * Apply the flip fix - negate condition, swap if/else bodies.
+	 *
+	 * @param File $phpcsFile   The file being scanned.
+	 * @param int  $ifToken     The if token position.
+	 * @param int  $elseToken   The else token position.
+	 * @param int  $elseOpener  The else scope opener position.
+	 * @param int  $elseCloser  The else scope closer position.
+	 *
+	 * @return void
+	 */
+	private function applyFlipFix( File $phpcsFile, $ifToken, $elseToken, $elseOpener, $elseCloser ) {
+		$tokens = $phpcsFile->getTokens();
+		$fixer  = $phpcsFile->fixer;
+
+		$ifOpener        = $tokens[ $ifToken ]['scope_opener'];
+		$ifCloser        = $tokens[ $ifToken ]['scope_closer'];
+		$conditionOpener = $tokens[ $ifToken ]['parenthesis_opener'];
+		$conditionCloser = $tokens[ $ifToken ]['parenthesis_closer'];
+
+		// Get the original condition.
+		$originalCondition = '';
+
+		for ( $i = $conditionOpener + 1; $i < $conditionCloser; $i++ ) {
+			$originalCondition .= $tokens[ $i ]['content'];
+		}
+		$originalCondition = trim( $originalCondition );
+
+		// Negate the condition.
+		$negatedCondition = $this->negateCondition( $originalCondition );
+
+		// Get the if body content.
+		$ifBodyContent = '';
+
+		for ( $i = $ifOpener + 1; $i < $ifCloser; $i++ ) {
+			$ifBodyContent .= $tokens[ $i ]['content'];
+		}
+
+		// Get the else body content.
+		$elseBodyContent = '';
+
+		for ( $i = $elseOpener + 1; $i < $elseCloser; $i++ ) {
+			$elseBodyContent .= $tokens[ $i ]['content'];
+		}
+
+		// Dedent the if body (it will become the code after the early return).
+		$ifBodyContent = $this->dedentCode( $ifBodyContent );
+
+		// Get the indentation.
+		$ifIndent = $this->getIndentation( $phpcsFile, $ifToken );
+
+		$fixer->beginChangeset();
+
+		// Replace the condition.
+		for ( $i = $conditionOpener + 1; $i < $conditionCloser; $i++ ) {
+			$fixer->replaceToken( $i, '' );
+		}
+		$fixer->addContent( $conditionOpener, ' ' . $negatedCondition . ' ' );
+
+		// Replace the if body with the else body.
+		// We need to ensure the closing brace ends up on its own line.
+		$elseBodyContent = rtrim( $elseBodyContent );
+
+		for ( $i = $ifOpener + 1; $i < $ifCloser; $i++ ) {
+			$fixer->replaceToken( $i, '' );
+		}
+		$fixer->addContent( $ifOpener, $phpcsFile->eolChar . $elseBodyContent . $phpcsFile->eolChar . $ifIndent );
+
+		// Remove the else keyword and braces, add the dedented if body.
+		for ( $i = $ifCloser + 1; $i <= $elseCloser; $i++ ) {
+			$fixer->replaceToken( $i, '' );
+		}
+
+		// Add the dedented if body after the if's closing brace.
+		$ifBodyContent = rtrim( $ifBodyContent );
+		$fixer->addContent( $ifCloser, $phpcsFile->eolChar . $phpcsFile->eolChar . $ifIndent . ltrim( $ifBodyContent ) . $phpcsFile->eolChar . $ifIndent );
 
 		$fixer->endChangeset();
 	}
 
+	/**
+	 * Negate a condition string.
+	 *
+	 * @param string $condition The original condition.
+	 *
+	 * @return string The negated condition.
+	 */
+	private function negateCondition( $condition ) {
+		$condition = trim( $condition );
+
+		// If condition starts with !, remove it.
+		if ( strpos( $condition, '! ' ) === 0 ) {
+			return substr( $condition, 2 );
+		}
+
+		if ( strpos( $condition, '!' ) === 0 && strpos( $condition, '!=' ) !== 0 ) {
+			return substr( $condition, 1 );
+		}
+
+		// For complex conditions, wrap in parentheses and negate.
+		return '! ( ' . $condition . ' )';
+	}
+
 	/**
 	 * Get the indentation of a token.
 	 *
diff --git a/phpcs-sniffs/Formidable/ruleset.xml b/phpcs-sniffs/Formidable/ruleset.xml
index 137f34aec4..2acf39c55e 100644
--- a/phpcs-sniffs/Formidable/ruleset.xml
+++ b/phpcs-sniffs/Formidable/ruleset.xml
@@ -18,6 +18,7 @@
 	<rule ref="Formidable.CodeAnalysis.SimplifyIssetTruthyCheck" />
 	<rule ref="Formidable.CodeAnalysis.SimplifyIssetEmptyCheck" />
 	<rule ref="Formidable.CodeAnalysis.SimplifyDualConditionToTernary" />
+	<rule ref="Formidable.CodeAnalysis.SimplifyEmptyTernary" />
 	<rule ref="Formidable.CodeAnalysis.RedundantEmptyOnParameter" />
 	<rule ref="Formidable.CodeAnalysis.RedundantEmptyOnAssignedVariable" />
 	<rule ref="Formidable.CodeAnalysis.RedundantParentheses" />
@@ -26,20 +27,19 @@
 	<rule ref="Formidable.CodeAnalysis.RedundantIssetBeforeNotEmpty" />
 	<rule ref="Formidable.CodeAnalysis.RedundantNotIssetBeforeEmpty" />
 	<rule ref="Formidable.CodeAnalysis.RemoveRedundantWpdbPrefix" />
+	<rule ref="Formidable.CodeAnalysis.RedundantEmptyAfterTypeCheck" />
 	<rule ref="Formidable.CodeAnalysis.PreferStrictComparison" />
 	<rule ref="Formidable.CodeAnalysis.PreferStrictInArray" />
 	<rule ref="Formidable.CodeAnalysis.PreferObGetClean" />
 	<rule ref="Formidable.CodeAnalysis.PreferKsesEcho" />
-	<rule ref="Formidable.CodeAnalysis.MoveVariableBelowEarlyReturn" />
 	<rule ref="Formidable.CodeAnalysis.PreferEscHtmlE" />
-	<rule ref="Formidable.CodeAnalysis.SimplifyEmptyTernary" />
+	<rule ref="Formidable.CodeAnalysis.PreferArrayKeyFirstLast" />
+	<rule ref="Formidable.CodeAnalysis.MoveVariableBelowEarlyReturn" />
 	<rule ref="Formidable.CodeAnalysis.StrictComparisonForIntFunctions" />
 	<rule ref="Formidable.CodeAnalysis.FlipNegativeTernary" />
 	<rule ref="Formidable.CodeAnalysis.FlipIfToEarlyReturn" />
 	<rule ref="Formidable.CodeAnalysis.FlipIfElseToEarlyReturn" />
 	<rule ref="Formidable.CodeAnalysis.FlipForeachIfToContinue" />
-	<rule ref="Formidable.CodeAnalysis.PreferArrayKeyFirstLast" />
-	<rule ref="Formidable.CodeAnalysis.RedundantEmptyAfterTypeCheck" />
 
 	<!-- PHPUnit -->
 	<rule ref="Formidable.PHPUnit.PreferAssertIsArray" />