diff --git a/src/CalcViewModel/Common/CopyPasteManager.cpp b/src/CalcViewModel/Common/CopyPasteManager.cpp
index f5aba2e4..a6ef1cb9 100644
--- a/src/CalcViewModel/Common/CopyPasteManager.cpp
+++ b/src/CalcViewModel/Common/CopyPasteManager.cpp
@@ -15,8 +15,6 @@ using namespace Windows::Foundation;
 using namespace Windows::System;
 using namespace Windows::ApplicationModel::DataTransfer;
 
-unsigned long long maxOperandNumber;
-
 String^ CopyPasteManager::supportedFormats[] =
 {
     StandardDataFormats::Text
diff --git a/src/CalcViewModel/Common/CopyPasteManager.h b/src/CalcViewModel/Common/CopyPasteManager.h
index 9a886154..bc00e37c 100644
--- a/src/CalcViewModel/Common/CopyPasteManager.h
+++ b/src/CalcViewModel/Common/CopyPasteManager.h
@@ -13,15 +13,15 @@ namespace CalculatorUnitTests
 
 namespace CalculatorApp
 {
-
-#define QwordType 1
-#define DwordType 2
-#define WordType 3
-#define ByteType 4
-#define HexBase 5
-#define DecBase 6
-#define OctBase 7
-#define BinBase 8
+    // TODO: Could be made into an enum : unsigned ?
+    constexpr auto QwordType = 1;
+    constexpr auto DwordType = 2;
+    constexpr auto WordType = 3;
+    constexpr auto ByteType = 4;
+    constexpr auto HexBase = 5;
+    constexpr auto DecBase = 6;
+    constexpr auto OctBase = 7;
+    constexpr auto BinBase = 8;
 
     class CopyPasteManager
     {