diff --git a/LanguageServer/src/main/java/org/nittalab/dtram/languageserver/model/Comments.java b/LanguageServer/src/main/java/org/nittalab/dtram/languageserver/model/Comments.java
new file mode 100644
index 0000000..e26c1ee
--- /dev/null
+++ b/LanguageServer/src/main/java/org/nittalab/dtram/languageserver/model/Comments.java
@@ -0,0 +1,13 @@
+package org.nittalab.dtram.languageserver.model;
+
+/**
+ * {@link Comments} class holds all tokens related to comments.
+ *
+ * @author Shohei Yamagiwa
+ * @since 0.1
+ */
+public class Comments {
+    public static final String COMMENT = "//";
+    public static final String MULTILINE_COMMENT_START = "/*";
+    public static final String MULTILINE_COMMENT_END = "*/";
+}
diff --git a/LanguageServer/src/main/java/org/nittalab/dtram/languageserver/model/Tokens.java b/LanguageServer/src/main/java/org/nittalab/dtram/languageserver/model/Tokens.java
index 9d1a9c8..5a7d494 100644
--- a/LanguageServer/src/main/java/org/nittalab/dtram/languageserver/model/Tokens.java
+++ b/LanguageServer/src/main/java/org/nittalab/dtram/languageserver/model/Tokens.java
@@ -21,8 +21,4 @@
     public static final String COLON = ":";
     public static final String DOT = ".";
     public static final String DOUBLE_QUOT = "\"";
-
-    public static final String COMMENT = "//";
-    public static final String MULTILINE_COMMENT_START = "/*";
-    public static final String MULTILINE_COMMENT_END = "*/";
 }
diff --git a/LanguageServer/src/main/java/org/nittalab/dtram/languageserver/utils/Tokenizer.java b/LanguageServer/src/main/java/org/nittalab/dtram/languageserver/utils/Tokenizer.java
index 387303c..a0271f1 100644
--- a/LanguageServer/src/main/java/org/nittalab/dtram/languageserver/utils/Tokenizer.java
+++ b/LanguageServer/src/main/java/org/nittalab/dtram/languageserver/utils/Tokenizer.java
@@ -1,9 +1,6 @@
 package org.nittalab.dtram.languageserver.utils;
 
-import org.nittalab.dtram.languageserver.model.Operators;
-import org.nittalab.dtram.languageserver.model.Position;
-import org.nittalab.dtram.languageserver.model.Token;
-import org.nittalab.dtram.languageserver.model.Tokens;
+import org.nittalab.dtram.languageserver.model.*;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -174,14 +171,14 @@
 
         for (Token originalToken : original) {
             switch (originalToken.getText()) {
-                case Tokens.MULTILINE_COMMENT_START -> {
+                case Comments.MULTILINE_COMMENT_START -> {
                     commentToken = new Token();
                     commentToken.setStartPos(originalToken.getStartPos());
 
                     commentText.append(originalToken.getText());
                     isComment = true;
                 }
-                case Tokens.MULTILINE_COMMENT_END -> {
+                case Comments.MULTILINE_COMMENT_END -> {
                     commentText.append(originalToken.getText());
                     isComment = false;
 
@@ -218,7 +215,7 @@
         Token commentToken = new Token();
 
         for (Token originalToken : original) {
-            if (originalToken.getText().equals(Tokens.COMMENT)) {
+            if (originalToken.getText().equals(Comments.COMMENT)) {
                 if (commentLine == -1) {
                     commentToken = new Token();
                     commentToken.setText(originalToken.getText());