diff --git a/all_cases/short_code.cc b/all_cases/short_code.cc
index 8090040..9a2a304 100644
--- a/all_cases/short_code.cc
+++ b/all_cases/short_code.cc
@@ -2,6 +2,7 @@
 #include <algorithm>
 #include <unordered_map>
 #include "all_cases.h"
+#include "short_code.h"
 #include "short_code_mark.h"
 
 // TODO: try to remove: `0` `O` `I` `l`
@@ -67,10 +68,10 @@ uint64_t unzip_short_code(uint32_t short_code) {
 
     uint32_t prefix = 0;
     for (; prefix < 256; ++prefix) {
-        if (short_code < SHORT_CODE_INDEX[head][prefix]) {
+        if (short_code < RANGE_PREFIX_INDEX[head][prefix]) {
             break;
         }
-        short_code -= SHORT_CODE_INDEX[head][prefix];
+        short_code -= RANGE_PREFIX_INDEX[head][prefix];
     }
 
     std::cout << "prefix: " << prefix << std::endl;
@@ -99,7 +100,7 @@ uint32_t zip_short_code(uint64_t code) {
     std::cout << "head offset: " << head_offset << std::endl;
 
     uint32_t prefix = (code >> 24) & 0xFF;
-    uint32_t prefix_offset = SHORT_CODE_OFFSET[head][prefix];
+    uint32_t prefix_offset = RANGE_PREFIX_OFFSET[head][prefix];
 
     std::cout << "prefix: " << prefix << std::endl;
     std::cout << "prefix offset: " << prefix_offset << std::endl;
@@ -130,11 +131,11 @@ uint32_t zip_short_code(uint64_t code) {
 
 int main() {
 
-//    auto ret_code = unzip_short_code(14323231);
-//    printf("result -> %08lX\n", ret_code);
+    auto ret_code = unzip_short_code(14323231);
+    printf("result -> %08lX\n", ret_code);
 
-    auto ret_code = zip_short_code(0x6EC0F8800);
-    printf("result -> %d\n", ret_code);
+    auto ret_short_code = zip_short_code(0x6EC0F8800);
+    printf("result -> %d\n", ret_short_code);
 
     return 0;
 
@@ -166,38 +167,5 @@ int main() {
 //    std::cout << code_to_string(14323231) << std::endl;
 //    std::cout << code_from_string("8IzVj") << std::endl;
 
-//    uint32_t offset[16];
-//    uint32_t sum = 0;
-//    for (int i = 0; i < 16; ++i) {
-//        offset[i] = sum;
-//        sum += ALL_CASES_INDEX[i];
-//    }
-//    for (int i = 0; i < 16; ++i) {
-//        std::cout << offset[i] << ", ";
-//    }
-
-//    uint32_t offset[256];
-//
-//    for (uint32_t head = 0; head < 16; ++head) {
-//
-//        uint32_t sum = 0;
-//        for (int i = 0; i < 256; ++i) {
-//            offset[i] = sum;
-//            sum += SHORT_CODE_INDEX[head][i];
-//        }
-//        std::cout << "{" << std::endl;
-//        for (int i = 0; i < 256; ++i) {
-//            if (i % 8 == 0) {
-//                std::cout << "    ";
-//            }
-////            printf("%7d, ", offset[i]);
-//            printf("%5d, ", SHORT_CODE_INDEX[head][i]);
-//            if (i % 8 == 7) {
-//                std::cout << std::endl;
-//            }
-//        }
-//        std::cout << "}," << std::endl;
-//    }
-
     return 0;
 }
diff --git a/all_cases/short_code.h b/all_cases/short_code.h
new file mode 100644
index 0000000..2e8e473
--- /dev/null
+++ b/all_cases/short_code.h
@@ -0,0 +1,10 @@
+#pragma once
+
+#include <cstdint>
+
+class ShortCode {
+public:
+    uint32_t zip_short_code(uint64_t code);
+    uint64_t unzip_short_code(uint32_t short_code);
+
+};
diff --git a/all_cases/short_code_mark.h b/all_cases/short_code_mark.h
index 7510173..7070e25 100644
--- a/all_cases/short_code_mark.h
+++ b/all_cases/short_code_mark.h
@@ -86,7 +86,7 @@ const uint32_t BASIC_RANGES_OFFSET[256] = {
     6847530, 6896085, 6911248, 6926411, 6969655, 7103308, 7146552, 7189796,
 };
 
-const uint32_t SHORT_CODE_INDEX[16][256] = {
+const uint32_t RANGE_PREFIX_INDEX[16][256] = {
     {
         70039,     0, 25594, 70039, 25594,  9527,  9324, 25594,
         22458,     0,  9527, 22458, 70039,     0, 25594, 70039,
@@ -633,7 +633,7 @@ const uint32_t SHORT_CODE_INDEX[16][256] = {
     },
 };
 
-const uint32_t SHORT_CODE_OFFSET[16][256] = {
+const uint32_t RANGE_PREFIX_OFFSET[16][256] = {
     {
               0,   70039,   70039,   95633,  165672,  191266,  200793,  210117,
          235711,  258169,  258169,  267696,  290154,  360193,  360193,  385787,