diff --git a/LibCmo/LibCmo/CK2/CKBitmapData.cpp b/LibCmo/LibCmo/CK2/CKBitmapData.cpp
index 46e0adc..2186bda 100644
--- a/LibCmo/LibCmo/CK2/CKBitmapData.cpp
+++ b/LibCmo/LibCmo/CK2/CKBitmapData.cpp
@@ -11,8 +11,8 @@ namespace LibCmo::CK2 {
 
 #pragma region Assist RW Functions
 
-	constexpr CKDWORD c_SpecificFmtHasTransparent = 2;
-	constexpr CKDWORD c_SpecificFmtNoTransparent = 1;
+	constexpr CKDWORD SPECIFIC_FMT_HAS_TRANSPARENT = 2;
+	constexpr CKDWORD SPECIFIC_FMT_NO_TRANSPARENT = 1;
 
 	bool CKBitmapData::ReadSpecificFormatBitmap(CKStateChunk* chk, VxMath::VxImageDescEx* slot) {
 		// read transparent prop
@@ -52,7 +52,7 @@ namespace LibCmo::CK2 {
 			VxMath::VxDoBlit(&cache, slot);
 
 			// proc image alpha
-			if (transprop == c_SpecificFmtHasTransparent) {
+			if (transprop == SPECIFIC_FMT_HAS_TRANSPARENT) {
 				CKDWORD alphacount;
 				chk->ReadStruct(alphacount);
 				if (alphacount == 1) {
@@ -145,7 +145,7 @@ namespace LibCmo::CK2 {
 
 				// write basic data
 				// whether has transparent
-				chk->WriteStruct(canSaveAlpha ? c_SpecificFmtNoTransparent : c_SpecificFmtHasTransparent);
+				chk->WriteStruct(canSaveAlpha ? SPECIFIC_FMT_NO_TRANSPARENT : SPECIFIC_FMT_HAS_TRANSPARENT);
 				// write ext and guid
 				chk->WriteBufferNoSize(savefmt->m_Ext.GetExt(), savefmt->m_Ext.GetSize());
 				chk->WriteStruct(savefmt->m_ReaderGuid);
diff --git a/LibCmo/LibCmo/CK2/CKContext.cpp b/LibCmo/LibCmo/CK2/CKContext.cpp
index cf30fa9..5594eca 100644
--- a/LibCmo/LibCmo/CK2/CKContext.cpp
+++ b/LibCmo/LibCmo/CK2/CKContext.cpp
@@ -267,7 +267,7 @@ namespace LibCmo::CK2 {
 		XContainer::XString result(YYCC::StringHelper::VPrintf(fmt, argptr));
 		va_end(argptr);
 
-		// use c_str(), not XContainer::NSXString::ToCKSTRING because we want make sure this paramter is not nullptr.
+		// use c_str(), not XContainer::NSXString::ToCKSTRING because we want make sure this parameter is not nullptr.
 		// we always output a valid C style string, even if no chars need to write.
 		m_OutputCallback(result.c_str());
 	}
diff --git a/LibCmo/LibCmo/CK2/CKDefines.hpp b/LibCmo/LibCmo/CK2/CKDefines.hpp
index 916ba54..f8a43ce 100644
--- a/LibCmo/LibCmo/CK2/CKDefines.hpp
+++ b/LibCmo/LibCmo/CK2/CKDefines.hpp
@@ -73,25 +73,25 @@ namespace LibCmo::CK2 {
 	class CKFileExtension {
 	public:
 		CKFileExtension() : m_Data() {
-			std::memset(m_Data, 0, c_DataLen);
+			std::memset(m_Data, 0, DATA_LEN);
 		}
 		CKFileExtension(CKSTRING s) : CKFileExtension() {
 			SetExt(s);
 		}
 		CKFileExtension(const CKFileExtension& rhs) : CKFileExtension() {
-			std::memcpy(m_Data, rhs.m_Data, c_DataLen);
+			std::memcpy(m_Data, rhs.m_Data, DATA_LEN);
 		}
-		CKFileExtension(CKFileExtension&& rhs) : CKFileExtension() {
-			std::memmove(m_Data, rhs.m_Data, c_DataLen);
-			std::memset(rhs.m_Data, 0, c_DataLen);
+		CKFileExtension(CKFileExtension&& rhs) noexcept : CKFileExtension() {
+			std::memmove(m_Data, rhs.m_Data, DATA_LEN);
+			std::memset(rhs.m_Data, 0, DATA_LEN);
 		}
 		CKFileExtension& operator=(const CKFileExtension& rhs) {
-			std::memcpy(m_Data, rhs.m_Data, c_DataLen);
+			std::memcpy(m_Data, rhs.m_Data, DATA_LEN);
 			return *this;
 		}
-		CKFileExtension& operator=(CKFileExtension&& rhs) {
-			std::memmove(m_Data, rhs.m_Data, c_DataLen);
-			std::memset(rhs.m_Data, 0, c_DataLen);
+		CKFileExtension& operator=(CKFileExtension&& rhs) noexcept {
+			std::memmove(m_Data, rhs.m_Data, DATA_LEN);
+			std::memset(rhs.m_Data, 0, DATA_LEN);
 			return *this;
 		}
 
@@ -101,7 +101,7 @@ namespace LibCmo::CK2 {
 			} else {
 				if (s[0] == u8'.') ++s;	// skip dot
 				CKDWORD len = CKStrLen(s);
-				if (len > (c_DataLen - 1)) len = c_DataLen - 1;
+				if (len > (DATA_LEN - 1)) len = DATA_LEN - 1;
 				std::memcpy(m_Data, s, len);
 			}
 		}
@@ -111,7 +111,7 @@ namespace LibCmo::CK2 {
 		}
 
 		CKDWORD GetSize() const {
-			return c_DataLen;
+			return DATA_LEN;
 		}
 
 		bool operator==(const CKFileExtension& rhs) const {
@@ -119,8 +119,8 @@ namespace LibCmo::CK2 {
 		}
 
 	protected:
-		static constexpr size_t c_DataLen = 4u;
-		CKCHAR m_Data[c_DataLen];
+		static constexpr size_t DATA_LEN = 4u;
+		CKCHAR m_Data[DATA_LEN];
 	};
 
 	/**