diff --git a/common/string/CStringManager.cpp b/common/string/CStringManager.cpp
index 3cf1ed6..c50d4a8 100644
--- a/common/string/CStringManager.cpp
+++ b/common/string/CStringManager.cpp
@@ -1,6 +1,5 @@
 #include "common/string/CStringManager.hpp"
 #include <climits>
-#include <cstdlib>
 #include <cstring>
 #include <storm/Memory.hpp>
 #include <storm/String.hpp>
@@ -23,8 +22,8 @@ CStringManager::CStringManager() {
 }
 
 char* CStringManager::Add(const char* str) {
-    uint32_t hashval = SStrHashHT(str);
-    uint32_t bucketIdx = hashval % 0x209;
+    auto hashval = SStrHashHT(str);
+    auto bucketIdx = hashval % C_STRING_MANAGER_BUCKETS;
     auto bucket = this->m_buckets[bucketIdx];
 
     if (bucket) {
diff --git a/common/string/CStringManager.hpp b/common/string/CStringManager.hpp
index a4cd866..70e6c80 100644
--- a/common/string/CStringManager.hpp
+++ b/common/string/CStringManager.hpp
@@ -3,6 +3,8 @@
 
 #include "common/string/CStringMemory.hpp"
 
+#define C_STRING_MANAGER_BUCKETS 521
+
 struct CStringElement;
 
 class CStringManager {
@@ -14,7 +16,7 @@ class CStringManager {
     static CStringManager* Get();
 
     // Member variables
-    CStringElement* m_buckets[521];
+    CStringElement* m_buckets[C_STRING_MANAGER_BUCKETS];
     CStringMemory m_memory;
 
     // Member functions