diff --git a/src/basic/basic_string.cpp b/src/basic/basic_string.cpp
index cd8c27d..6b2a72a 100644
--- a/src/basic/basic_string.cpp
+++ b/src/basic/basic_string.cpp
@@ -423,19 +423,20 @@ API String SkipUntil(String *string, String str) {
         *string = Skip(*string, 1);
     }
     return begin;
-}
 
+}
 API String SkipWhitespace(String *string) {
     String begin = {string->data, 0};
-    for (Int i = 0; i < string->len; i += 1) {
-        if (!IsWhitespace(string->data[i])) break;
+    for (;string->len;) {
+        if (!IsWhitespace(At(*string, 0))) {
+            break;
+        }
         *string = Skip(*string, 1);
         begin.len += 1;
     }
     return begin;
 }
 
-
 API String ChopNumberEx(String *string) {
     String col = {};
     for (int64_t i = string->len - 1; i >= 0; i -= 1) {
diff --git a/src/text_editor/buffer.cpp b/src/text_editor/buffer.cpp
index b17473e..8ae035d 100644
--- a/src/text_editor/buffer.cpp
+++ b/src/text_editor/buffer.cpp
@@ -307,7 +307,7 @@ API Int GetWordEnd(Buffer *buffer, Int pos) {
 }
 
 API bool IsLoadWord(char16_t w) {
-    bool result = w == u'-' || w == u'/' || w == u'\\' || w == u':' || w == u'$' || w == u'_' || w == u'.' || w == u'!' || w == u'@' || w == u',';
+    bool result = w == u'-' || w == u'/' || w == u'\\' || w == u':' || w == u'$' || w == u'_' || w == u'.' || w == u'!' || w == u'@';
     if (!result) {
         result = !(IsSymbol(w) || IsWhitespace(w));
     }