diff --git a/source/Diol/src/Diol.Share/Services/SqlQueryService.cs b/source/Diol/src/Diol.Share/Services/SqlQueryService.cs
index c6e5aac..9aceaaf 100644
--- a/source/Diol/src/Diol.Share/Services/SqlQueryService.cs
+++ b/source/Diol/src/Diol.Share/Services/SqlQueryService.cs
@@ -21,72 +21,32 @@ public class SqlQueryService
         /// </summary>
         /// <param name="sqlQuery">The SELECT query.</param>
         /// <returns>The table name.</returns>
-        public static string ExtractTableNameFromSelectQuery(string sqlQuery)
-        {
-            string pattern = @"FROM\s+\[?(\w+)\]?";
-            Match match = Regex.Match(sqlQuery, pattern, RegexOptions.IgnoreCase);
-
-            if (match.Success)
-            {
-                return match.Groups[1].Value;
-            }
-
-            return string.Empty;
-        }
+        public static string ExtractTableNameFromSelectQuery(string sqlQuery) =>
+            ExtractFromQuery(sqlQuery, @"FROM\s+\[?(\w+)\]?");
 
         /// <summary>
         /// Extracts the table name from an INSERT query.
         /// </summary>
         /// <param name="sqlQuery">The INSERT query.</param>
         /// <returns>The table name.</returns>
-        public static string ExtractTableNameFromInsertQuery(string sqlQuery)
-        {
-            string pattern = @"INTO\s+\[?(\w+)\]?";
-            Match match = Regex.Match(sqlQuery, pattern, RegexOptions.IgnoreCase);
-
-            if (match.Success)
-            {
-                return match.Groups[1].Value;
-            }
-
-            return string.Empty;
-        }
+        public static string ExtractTableNameFromInsertQuery(string sqlQuery) =>
+            ExtractFromQuery(sqlQuery, @"INTO\s+\[?(\w+)\]?");
 
         /// <summary>
         /// Extracts the table name from an UPDATE query.
         /// </summary>
         /// <param name="sqlQuery">The UPDATE query.</param>
         /// <returns>The table name.</returns>
-        public static string ExtractTableNameFromUpdateQuery(string sqlQuery)
-        {
-            string pattern = @"UPDATE\s+\[?(\w+)\]?";
-            Match match = Regex.Match(sqlQuery, pattern, RegexOptions.IgnoreCase);
-
-            if (match.Success)
-            {
-                return match.Groups[1].Value;
-            }
-
-            return string.Empty;
-        }
+        public static string ExtractTableNameFromUpdateQuery(string sqlQuery) =>
+            ExtractFromQuery(sqlQuery, @"UPDATE\s+\[?(\w+)\]?");
 
         /// <summary>
         /// Extracts the table name from a DELETE query.
         /// </summary>
         /// <param name="sqlQuery">The DELETE query.</param>
         /// <returns>The table name.</returns>
-        public static string ExtractTableNameFromDeleteQuery(string sqlQuery)
-        {
-            string pattern = @"FROM\s+\[?(\w+)\]?";
-            Match match = Regex.Match(sqlQuery, pattern, RegexOptions.IgnoreCase);
-
-            if (match.Success)
-            {
-                return match.Groups[1].Value;
-            }
-
-            return string.Empty;
-        }
+        public static string ExtractTableNameFromDeleteQuery(string sqlQuery) =>
+            ExtractFromQuery(sqlQuery, @"FROM\s+\[?(\w+)\]?");
 
         /// <summary>
         /// Extracts the operation name from a SQL query.
@@ -117,5 +77,23 @@ public static bool IsTransaction(string sqlQuery)
         {
             return sqlQuery.Contains("IMPLICIT_TRANSACTIONS");
         }
+        
+        /// <summary>
+        /// Extracts a value from a SQL query base on pattern.
+        /// </summary>
+        /// <param name="sqlQuery">The query.</param>
+        /// <param name="pattern">Regex pattern.</param>
+        /// <returns></returns>
+        private static string ExtractFromQuery(string sqlQuery, string pattern)
+        {
+            Match match = Regex.Match(sqlQuery, pattern, RegexOptions.IgnoreCase);
+
+            if (match.Success)
+            {
+                return match.Groups[1].Value;
+            }
+
+            return string.Empty;
+        }
     }
 }