diff --git a/lib/src/Tokenizer/Tokenizer.cpp b/lib/src/Tokenizer/Tokenizer.cpp
index 11d7862..d73f432 100644
--- a/lib/src/Tokenizer/Tokenizer.cpp
+++ b/lib/src/Tokenizer/Tokenizer.cpp
@@ -22,6 +22,7 @@
 
 #include <artichoke/Tokenizer/Tokenizer.hpp>
 
+#include <print>
 #include <utility>
 
 #include <artichoke/Tokenizer/TokenizerRange.hpp>
@@ -41,20 +42,20 @@ namespace arti::lang {
   }
 
   Tokenizer::Tokenizer(Tokenizer &&rhs) noexcept
-    : line(rhs.line)
-    , column(rhs.column)
-    , iter(rhs.iter)
+    : line(std::exchange(rhs.line, 0))
+    , column(std::exchange(rhs.column, 0))
+    , iter(std::exchange(rhs.iter, {}))
     , tokensGenerator(std::exchange(rhs.tokensGenerator, {}))
     , tokensBuffer(std::exchange(rhs.tokensBuffer, {}))
-    , source(std::exchange(rhs.source, "")) { }
+    , source(std::exchange(rhs.source, {})) { }
 
   Tokenizer &Tokenizer::operator=(Tokenizer &&rhs) noexcept {
-    line = rhs.line;
-    column = rhs.column;
-    iter = std::move(rhs.iter);
-    source = std::move(rhs.source);
-    tokensBuffer = std::move(rhs.tokensBuffer);
-    tokensGenerator = std::move(rhs.tokensGenerator);
+    line = std::exchange(rhs.line, 0);
+    column = std::exchange(rhs.column, 0);
+    iter = std::exchange(rhs.iter, {});
+    source = std::exchange(rhs.source, {});
+    tokensBuffer = std::exchange(rhs.tokensBuffer, {});
+    tokensGenerator = std::exchange(rhs.tokensGenerator, {});
     return *this;
   }
 
@@ -282,7 +283,7 @@ namespace arti::lang {
           }
           else if (*(iter + 1) == '/') {
             iter += 2;
-            column += 2;
+            column += 1;
             return {};
           }
         }
@@ -744,6 +745,8 @@ namespace arti::lang {
   TrieMap<TokenV> buildOperatorsTrieMap();
 
   Expected<Token> Tokenizer::readOperator() {
+    static auto tm = buildOperatorsTrieMap();
+
     auto stIter = iter;
 
     auto cLine = line;
@@ -754,8 +757,6 @@ namespace arti::lang {
       ++column;
     };
 
-    auto tm = buildOperatorsTrieMap();
-
     if (not tm.root.childs.contains(*iter)) {
       return langException<ExceptCode::ecInvalidCharacter>(line, column, *iter);
     }
@@ -781,8 +782,8 @@ namespace arti::lang {
 
     Token tok{
       TokenV::opStar,
-      line = cLine,
-      column = cColumn,
+      cLine,
+      cColumn,
       { stIter, iter }
     };
 
@@ -791,6 +792,7 @@ namespace arti::lang {
     }
     else if (lvNode != nullptr) {
       iter -= lvNodeDiff;
+      column -= static_cast<size_t>(lvNodeDiff);
       tok.value = *lvNode->value;
       tok.strValue = std::string_view{ stIter, iter };
     }