diff --git a/src/main/java/de/gnmyt/SQLToolkit/factory/TableFactory.java b/src/main/java/de/gnmyt/SQLToolkit/factory/TableFactory.java
index 08c328b..45bddec 100644
--- a/src/main/java/de/gnmyt/SQLToolkit/factory/TableFactory.java
+++ b/src/main/java/de/gnmyt/SQLToolkit/factory/TableFactory.java
@@ -40,6 +40,7 @@ public class TableFactory {
 
     /**
      * Gets a storage medium from the list
+     *
      * @param storageClass The class of the storage medium you want to get
      * @return the storage medium
      */
diff --git a/src/main/java/de/gnmyt/SQLToolkit/manager/DataBaseSelection.java b/src/main/java/de/gnmyt/SQLToolkit/manager/DataBaseSelection.java
index a553bd9..4ce7bcd 100644
--- a/src/main/java/de/gnmyt/SQLToolkit/manager/DataBaseSelection.java
+++ b/src/main/java/de/gnmyt/SQLToolkit/manager/DataBaseSelection.java
@@ -135,9 +135,7 @@ public class DataBaseSelection {
             messageBuilder.append((added.get()) ? ", " : "").append(v);
             added.set(true);
         });
-        StackTraceElement[] st = Thread.currentThread().getStackTrace();
-        StackTraceElement stack = st[st.length - 1];
-        LOG.debug("DEBUG <" + stack.getFileName() + ":" + stack.getLineNumber() + "> Statement: " + messageBuilder);
+        LOG.debug("Statement: " + messageBuilder);
         return this;
     }
 
diff --git a/src/main/java/de/gnmyt/SQLToolkit/manager/UpdateManager.java b/src/main/java/de/gnmyt/SQLToolkit/manager/UpdateManager.java
index 4af7262..c1a954f 100644
--- a/src/main/java/de/gnmyt/SQLToolkit/manager/UpdateManager.java
+++ b/src/main/java/de/gnmyt/SQLToolkit/manager/UpdateManager.java
@@ -167,11 +167,13 @@ public class UpdateManager {
         sb.append("UPDATE ").append(tableName);
         if (!setList.isEmpty()) sb.append(" SET ");
         AtomicBoolean used = new AtomicBoolean(false);
+
         setList.forEach((str, obj) -> {
             if (used.get()) sb.append(", ");
             sb.append(str).append(" = ?");
             used.set(true);
         });
+
         if (!whereList.isEmpty()) sb.append(" WHERE ");
         AtomicBoolean used2 = new AtomicBoolean(false);
         whereList.forEach((str, obj) -> {