diff --git a/app/src/sys.cpp b/app/src/sys.cpp
index c64c61f..2f21f06 100644
--- a/app/src/sys.cpp
+++ b/app/src/sys.cpp
@@ -1,4 +1,4 @@
-#include <stdio.h>
+#include <cstdio>
 #include <unistd.h>
 #include "sys.hpp"
 #include <raylib.h>
@@ -25,7 +25,7 @@ namespace sys
     const char *saveFilePath = transformFilePath(filename);
 
     FILE *file = fopen(saveFilePath, "wb");
-    if (file == NULL)
+    if (file == nullptr)
       return false;
 
     size_t ret = fwrite(data, 1, size, file);
@@ -39,7 +39,7 @@ namespace sys
     const char *saveFilePath = transformFilePath(filename);
 
     FILE *file = fopen(saveFilePath, "rb");
-    if (file == NULL)
+    if (file == nullptr)
       return false;
 
     size_t ret = fread(data, 1, size, file);
diff --git a/shared/inc/TcpSocket.hpp b/shared/inc/TcpSocket.hpp
index e714be9..f035151 100644
--- a/shared/inc/TcpSocket.hpp
+++ b/shared/inc/TcpSocket.hpp
@@ -2,8 +2,6 @@
 #include <netinet/in.h>
 #include <cinttypes>
 
-#define AS_DEFAULT_BUFFER_SIZE 0x1000 /*4096 bytes*/
-
 constexpr int64_t StartHeader = 1737720524UL;
 constexpr uint16_t serverPort = 9000;
 constexpr uint16_t keyPort = 9010;
diff --git a/shared/inc/canvas/Tree.hpp b/shared/inc/canvas/Tree.hpp
index 407a16c..5c1c8b2 100644
--- a/shared/inc/canvas/Tree.hpp
+++ b/shared/inc/canvas/Tree.hpp
@@ -28,7 +28,6 @@ private:
   Dna *m_dna;
   uint128 branchSeed;
 
-  int canvasSize = 0;
   Vector2 start = {0};
   std::list<DrawArgs> drawCalls;
 
diff --git a/shared/inc/values/mrand.hpp b/shared/inc/values/mrand.hpp
index 2d22b18..5e6e28b 100644
--- a/shared/inc/values/mrand.hpp
+++ b/shared/inc/values/mrand.hpp
@@ -1,4 +1,4 @@
-#include <inttypes.h>
+#include <cinttypes>
 
 struct uint128
 {
diff --git a/shared/src/TcpSocket.cpp b/shared/src/TcpSocket.cpp
index ceed999..ec8bef8 100644
--- a/shared/src/TcpSocket.cpp
+++ b/shared/src/TcpSocket.cpp
@@ -40,7 +40,7 @@ namespace TcpSocket
     char ip[INET_ADDRSTRLEN];
     inet_ntop(AF_INET, &(address.sin_addr), ip, INET_ADDRSTRLEN);
 
-    return std::string(ip);
+    return {ip};
   }
 
   int remotePort(sockaddr_in &address) { return ntohs(address.sin_port); }
diff --git a/shared/src/canvas/BackGround.cpp b/shared/src/canvas/BackGround.cpp
index ad767a7..1a3107b 100644
--- a/shared/src/canvas/BackGround.cpp
+++ b/shared/src/canvas/BackGround.cpp
@@ -14,12 +14,6 @@ constexpr static float moonXOffset = 0.1f;
 constexpr static float minSizeOfMoon = 0.1f;
 constexpr static float maxSizeOfMoon = 0.15f;
 constexpr static float maxYPosOfMoon = 0.80f;
-constexpr static float bigRingRatio = 0.5f;
-constexpr static float smallRingRatio = 0.25f;
-constexpr static float bigRingBlend = 0.02f;
-constexpr static float smallRingBlend = 0.05f;
-constexpr static float colorRatio1 = 0.3f;
-constexpr static float colorRatio2 = 0.7f;
 constexpr static float mounten1min = 0.65f;
 constexpr static float mounten1max = 0.85f;
 constexpr static float mounten2min = 0.80f;
diff --git a/shared/src/canvas/Circle.cpp b/shared/src/canvas/Circle.cpp
index 69b259f..3a0a85b 100644
--- a/shared/src/canvas/Circle.cpp
+++ b/shared/src/canvas/Circle.cpp
@@ -16,9 +16,9 @@ int Circle::colorLoc;
 void Circle::init()
 {
 #if defined(PLATFORM_ANDROID) || defined(PLATFORM_WEB)
-  shader = LoadShaderFromMemory(0, sun_shader_100);
+  shader = LoadShaderFromMemory(nullptr, sun_shader_100);
 #else
-  shader = LoadShaderFromMemory(0, (const char *)shaders_sun_330_fs);
+  shader = LoadShaderFromMemory(nullptr, (const char *)shaders_sun_330_fs);
 #endif
   target = LoadRenderTexture(sizeTexute, sizeTexute);
 
diff --git a/shared/src/canvas/Tree.cpp b/shared/src/canvas/Tree.cpp
index e71057c..eb6c056 100644
--- a/shared/src/canvas/Tree.cpp
+++ b/shared/src/canvas/Tree.cpp
@@ -38,7 +38,6 @@ void calculateLevels(int canvasSize)
 // Public
 void Tree::init(int size)
 {
-  this->canvasSize = size;
   start.x = size / 2;
   start.y = size;
   calculateLevels(size);
diff --git a/shared/src/values/Dna.cpp b/shared/src/values/Dna.cpp
index ddbf876..727120e 100644
--- a/shared/src/values/Dna.cpp
+++ b/shared/src/values/Dna.cpp
@@ -13,7 +13,6 @@ namespace DNA
     {
       array[i] = mrand::getValue(256, state);
     }
-    return;
   }
 
   void makeChild(Dna *p1, Dna *p2, Dna *c, uint128 *state)
@@ -38,8 +37,8 @@ namespace DNA
   void clone(Dna *p1, Dna *c, uint128 *state)
   {
     uint8_t *p1a = (uint8_t *)p1;
-
     uint8_t *ca = (uint8_t *)c;
+    
     for (size_t i = 0; i < sizeof(Dna); i++)
     {
       int val = mrand::getValue(2, state);
diff --git a/shared/src/values/DnaManager.cpp b/shared/src/values/DnaManager.cpp
index cbc531b..e5cc961 100644
--- a/shared/src/values/DnaManager.cpp
+++ b/shared/src/values/DnaManager.cpp
@@ -56,7 +56,7 @@ void DnaManager::newGen(DnaManagerData *data)
   data->queued = 0;
   data->showed = 0;
   data->generation += 1;
-  if (data->liked.size() == 0)
+  if (data->liked.empty())
   {
     for (std::size_t i = 0; i < NUM_PER_GEN; i++)
     {
diff --git a/shared/src/values/Similarity.cpp b/shared/src/values/Similarity.cpp
index 97fbae7..b36bd98 100644
--- a/shared/src/values/Similarity.cpp
+++ b/shared/src/values/Similarity.cpp
@@ -1,10 +1,6 @@
 #include "values/Similarity.hpp"
 #include <cmath>
 
-#define MATCH 1
-#define MISMATCH -1
-#define GAP -2
-
 namespace Similarity
 {
   // todo: use int8_t insted of uint8_t and map data