[ META ] Update formating.

Signed-off-by: Amlal El Mahrouss <amlal.elmahrouss@icloud.com>

70 files changed, 334 insertions, 332 deletions

diff --git a/dev/DDK/KernelAlloc.c b/dev/DDK/KernelAlloc.c
index cb79b538..75aa3213 100644
--- a/dev/DDK/KernelAlloc.c
+++ b/dev/DDK/KernelAlloc.c
@@ -15,11 +15,12 @@
 */
 DK_EXTERN void* KernelAlloc(size_t sz)
 {
-    if (!sz) ++sz;
+	if (!sz)
+		++sz;
 
 	void* ptr = KernelCall("NewHeap", 1, &sz, sizeof(size_t));
 
-    return ptr;
+	return ptr;
 }
 
 /**
@@ -28,7 +29,8 @@ DK_EXTERN void* KernelAlloc(size_t sz)
 */
 DK_EXTERN void KernelFree(void* ptr)
 {
-    if (!ptr) return;
+	if (!ptr)
+		return;
 
 	KernelCall("DeleteHeap", 1, ptr, 0);
 }
diff --git a/dev/DDK/KernelCxxRt.cxx b/dev/DDK/KernelCxxRt.cxx
index 3029caa1..13471a19 100644
--- a/dev/DDK/KernelCxxRt.cxx
+++ b/dev/DDK/KernelCxxRt.cxx
@@ -10,20 +10,20 @@
 
 void* operator new(size_t sz)
 {
-    return KernelAlloc(sz);
+	return KernelAlloc(sz);
 }
 
 void operator delete(void* ptr)
 {
-    KernelFree(ptr);
+	KernelFree(ptr);
 }
 
 void* operator new[](size_t sz)
 {
-    return KernelAlloc(sz);
+	return KernelAlloc(sz);
 }
 
 void operator delete[](void* ptr)
 {
-    KernelFree(ptr);
+	KernelFree(ptr);
 }
diff --git a/dev/DDK/KernelDev.h b/dev/DDK/KernelDev.h
index 2e166ace..e051c7a3 100644
--- a/dev/DDK/KernelDev.h
+++ b/dev/DDK/KernelDev.h
@@ -18,9 +18,9 @@ typedef struct _KERNEL_DEVICE DK_FINAL
 	char name[255];					   // the device name. Could be /./DEVICE_NAME/
 	void* (*read)(void* arg, int len); // read from device.
 	void (*write)(void* arg, int len);
-	void (*wait)(void);								 // write to device.
+	void (*wait)(void);								  // write to device.
 	struct _KERNEL_DEVICE* (*open)(const char* path); // open device.
-	void (*close)(struct _KERNEL_DEVICE* dev);		 // close device.
+	void (*close)(struct _KERNEL_DEVICE* dev);		  // close device.
 } KERNEL_DEVICE, *KERNEL_DEVICE_PTR;
 
 /// @brief Open a new device from path.
diff --git a/dev/DDK/KernelStd.h b/dev/DDK/KernelStd.h
index ebc8f47b..ab0c6eb8 100644
--- a/dev/DDK/KernelStd.h
+++ b/dev/DDK/KernelStd.h
@@ -14,7 +14,7 @@
 #if defined(__cplusplus)
 #define DK_EXTERN extern "C"
 #define nil		  nullptr
-#define DK_FINAL final
+#define DK_FINAL  final
 #else
 #define DK_EXTERN extern
 #define nil		  ((void*)0)
@@ -30,9 +30,9 @@ struct DDK_PROPERTY_RECORD;
 
 struct DDK_PROPERTY_RECORD DK_FINAL
 {
-    char* p_name;
-    void* p_object;
-    void* p_xpcom_object;
+	char* p_name;
+	void* p_object;
+	void* p_xpcom_object;
 };
 
 /// \brief DDK status structure (__at_enable, __at_disable...)
@@ -41,7 +41,7 @@ struct DDK_STATUS_STRUCT DK_FINAL
 	int32_t s_action_id;
 	int32_t s_issuer_id;
 	int32_t s_group_id;
-	void*   s_object;
+	void*	s_object;
 };
 
 /// @brief Call Kernel (interrupt 0x33)
@@ -66,7 +66,6 @@ DK_EXTERN void* KernelAlloc(size_t sz);
 /// @param pointer to free
 DK_EXTERN void KernelFree(void*);
 
-
 /// @brief Get a Kernel property.
 /// @param slot property id (always 0)
 /// @param name the property's name.
diff --git a/dev/DDK/KernelVersion.c b/dev/DDK/KernelVersion.c
index 4b69aa34..c40e8ff9 100644
--- a/dev/DDK/KernelVersion.c
+++ b/dev/DDK/KernelVersion.c
@@ -21,5 +21,5 @@
 #endif // !cDDKVersion

 

 int32_t c_api_version_highest = cDDKVersionHighest;

-int32_t c_api_version_least = cDDKVersionLowest;

-int32_t c_api_version = cDDKVersion;

+int32_t c_api_version_least	  = cDDKVersionLowest;

+int32_t c_api_version		  = cDDKVersion;

diff --git a/dev/DLL/EncryptFS/EncryptFS.hxx b/dev/DLL/EncryptFS/EncryptFS.hxx
index 4aa82666..4dfafe7c 100644
--- a/dev/DLL/EncryptFS/EncryptFS.hxx
+++ b/dev/DLL/EncryptFS/EncryptFS.hxx
@@ -18,5 +18,5 @@
 namespace EncryptFS

 {

 	using namespace Kernel;

-	

+

 }
\ No newline at end of file
diff --git a/dev/DLL/EncryptFS/Sources/EncryptBlock.cxx b/dev/DLL/EncryptFS/Sources/EncryptBlock.cxx
index 09b8c0d9..b3f2fc56 100644
--- a/dev/DLL/EncryptFS/Sources/EncryptBlock.cxx
+++ b/dev/DLL/EncryptFS/Sources/EncryptBlock.cxx
@@ -9,6 +9,6 @@
 
 enum
 {
-    eEFSFlagEncrypted = 0x3f,
-    eEFSFlagEncryptedEPM = 0xf3,
+	eEFSFlagEncrypted	 = 0x3f,
+	eEFSFlagEncryptedEPM = 0xf3,
 };
diff --git a/dev/DLL/EncryptFS/Sources/Key.cxx b/dev/DLL/EncryptFS/Sources/Key.cxx
index 457ce1b8..166d04b3 100644
--- a/dev/DLL/EncryptFS/Sources/Key.cxx
+++ b/dev/DLL/EncryptFS/Sources/Key.cxx
@@ -9,4 +9,4 @@
 #include <cstdint>
 
 typedef int32_t efs_encrypt_token_t;
-typedef void* efs_encrypted_blob_t;
+typedef void*	efs_encrypted_blob_t;
diff --git a/dev/DLL/WRenderer/Sources/UIRenderView.cxx b/dev/DLL/WRenderer/Sources/UIRenderView.cxx
index 0091cef4..d4281675 100644
--- a/dev/DLL/WRenderer/Sources/UIRenderView.cxx
+++ b/dev/DLL/WRenderer/Sources/UIRenderView.cxx
@@ -11,7 +11,7 @@
 

 namespace System

 {

-	UIRenderView::UIRenderView() = default;

+	UIRenderView::UIRenderView()  = default;

 	UIRenderView::~UIRenderView() = default;

 

 	UIRenderEffect* UIRenderView::GetEffect(const SizeT& at)

diff --git a/dev/SCI/sci_base.hxx b/dev/SCI/sci_base.hxx
index e3bc39de..0cff8f0d 100644
--- a/dev/SCI/sci_base.hxx
+++ b/dev/SCI/sci_base.hxx
@@ -39,8 +39,8 @@ typedef char			 Char;
 #ifdef __SCI_IMPL__

 #include <SCI/xpcom_core.hxx>

 #else

-class IUnknown; // Refrenced from an IDB entry.

-class UnknownUCLSID;	// From the IDB, the constructor of the object, e.g: WordUCLSID.

+class IUnknown;		 // Refrenced from an IDB entry.

+class UnknownUCLSID; // From the IDB, the constructor of the object, e.g: WordUCLSID.

 class UUID;

 

 /// @brief Allocate new SCM class.

@@ -70,10 +70,10 @@ public:
 	IUnknown& operator=(const IUnknown&) = default;

 	IUnknown(const IUnknown&)			 = default;

 

-	virtual SInt32			  Release()					   = 0;

-	virtual void			  RemoveRef()			   = 0;

-	virtual IUnknown* AddRef()			   = 0;

-	virtual VoidPtr			  QueryInterface(UUID* p_uuid) = 0;

+	virtual SInt32	  Release()					   = 0;

+	virtual void	  RemoveRef()				   = 0;

+	virtual IUnknown* AddRef()					   = 0;

+	virtual VoidPtr	  QueryInterface(UUID* p_uuid) = 0;

 };

 

 template <typename FnSign, typename ClsID>

@@ -86,7 +86,7 @@ public:
 	IEventListener& operator=(const IEventListener&) = default;

 	IEventListener(const IEventListener&)			 = default;

 

-    virtual IEventListener& operator +=(FnSign arg) = 0;

+	virtual IEventListener& operator+=(FnSign arg) = 0;

 };

 #endif

 

@@ -185,7 +185,7 @@ IMPORT_C SInt32 XPCOMCreateInstance(_Input UInt32 flags, _Output ZKAObject* hand
 

 /// @brief Destroys an SCM instance of the process.

 /// @param handle_instance the SCM handle.

-IMPORT_C UInt0  XPCOMDestroyInstance(_Input ZKAObject handle_instance);

+IMPORT_C UInt0 XPCOMDestroyInstance(_Input ZKAObject handle_instance);

 

 // ------------------------------------------------------------------------

 // Memory Management API.

diff --git a/dev/SCI/xpcom_core.hxx b/dev/SCI/xpcom_core.hxx
index f48fd30b..1362319d 100644
--- a/dev/SCI/xpcom_core.hxx
+++ b/dev/SCI/xpcom_core.hxx
@@ -10,16 +10,16 @@ Purpose: Base code of SCM.
 /// @internal

 

 #ifndef __NDK__

-#define object class

+#define object	 class

 #define protocol class

 #define clsid(X)

 

 #warning ! You may be using the clang version of the ZKA kit, please be cautious that some thing mayn't be present. !

 #endif // !__NDK__

 

-protocol IUnknown; // Refrenced from an IDB entry.

-protocol UnknownUCLSID;	// From the IDB, the constructor of the object, e.g: TextUCLSID.

-object UUID;

+protocol IUnknown;		// Refrenced from an IDB entry.

+protocol UnknownUCLSID; // From the IDB, the constructor of the object, e.g: TextUCLSID.

+object	 UUID;

 

 /// @brief Unknown XPCOM interface

 protocol clsid("d7c144b6-0792-44b8-b06b-02b227b547df") IUnknown

@@ -31,10 +31,10 @@ public:
 	IUnknown& operator=(const IUnknown&) = default;

 	IUnknown(const IUnknown&)			 = default;

 

-	virtual SInt32 Release() = 0;

-	virtual void RemoveRef() = 0;

-	virtual IUnknown* AddRef() = 0;

-	virtual VoidPtr QueryInterface(UUID* p_uuid) = 0;

+	virtual SInt32	  Release()						= 0;

+	virtual void	  RemoveRef()					= 0;

+	virtual IUnknown* AddRef()						= 0;

+	virtual VoidPtr	  QueryInterface(UUID * p_uuid) = 0;

 };

 

 /// @brief Allocate new SCM object.

@@ -45,7 +45,7 @@ public:
 template <typename TCLS, typename UCLSID, typename... Args>

 inline TCLS* XPCOMQueryInterface(UCLSID* uclsidOfCls, Args&&... args)

 {

-    uclsidOfCls->AddRef();

+	uclsidOfCls->AddRef();

 	return uclsidOfCls->QueryInterfaceWithArgs(args...);

 }

 

@@ -77,9 +77,9 @@ public:
 	IEventListener& operator=(const IEventListener&) = default;

 	IEventListener(const IEventListener&)			 = default;

 

-    virtual IEventListener& operator +=(FnSign arg)

+	virtual IEventListener& operator+=(FnSign arg)

 	{

-        this->AddEventListener(arg);

-        return *this;

-    }

+		this->AddEventListener(arg);

+		return *this;

+	}

 };

diff --git a/dev/ZBA/BootKit/Support.hxx b/dev/ZBA/BootKit/Support.hxx
index d7053f66..8b9ab105 100644
--- a/dev/ZBA/BootKit/Support.hxx
+++ b/dev/ZBA/BootKit/Support.hxx
@@ -18,7 +18,7 @@
 #define MoveMem(dst, src, sz) memcpy(dst, src, sz)
 #define CopyMem(dst, src, sz) memcpy(dst, src, sz)
 #define StrLen(src)			  strlen(src)
-#define StrCmp(dst, src) strcmp(dst, src)
+#define StrCmp(dst, src)	  strcmp(dst, src)
 
 #endif // __NEWOSLDR__
 
diff --git a/dev/ZBA/BootKit/Thread.hxx b/dev/ZBA/BootKit/Thread.hxx
index 3946f6eb..558dc9f0 100644
--- a/dev/ZBA/BootKit/Thread.hxx
+++ b/dev/ZBA/BootKit/Thread.hxx
@@ -22,7 +22,7 @@ namespace Boot
 	{
 	public:
 		explicit BThread() = delete;
-		~BThread()		 = default;
+		~BThread()		   = default;
 
 		explicit BThread(Kernel::VoidPtr blob);
 
@@ -32,10 +32,10 @@ namespace Boot
 		void		Start(HEL::HandoverInformationHeader* handover);
 		const char* GetName();
 		void		SetName(const char* name);
-		bool 		IsValid();
+		bool		IsValid();
 
 	private:
-		Char	fBlobName[255] = { "BootThread" };
+		Char	fBlobName[255] = {"BootThread"};
 		VoidPtr fStartAddress{nullptr};
 		VoidPtr fBlob{nullptr};
 	};
diff --git a/dev/ZBA/BootKit/Vendor/Qr.hxx b/dev/ZBA/BootKit/Vendor/Qr.hxx
index a2af4367..77a5a802 100644
--- a/dev/ZBA/BootKit/Vendor/Qr.hxx
+++ b/dev/ZBA/BootKit/Vendor/Qr.hxx
@@ -1,12 +1,12 @@
 #ifndef QR_HXX
 #define QR_HXX
 
-extern "C" {
+extern "C"
+{
 
 #include <math.h>
 #include <stddef.h>
 #include <stdint.h>
-
 }
 
 #include <BootKit/Vendor/Shared/base.h>
diff --git a/dev/ZBA/BootKit/Vendor/stb_image.hxx b/dev/ZBA/BootKit/Vendor/stb_image.hxx
index ca4576d7..af5f82fc 100644
--- a/dev/ZBA/BootKit/Vendor/stb_image.hxx
+++ b/dev/ZBA/BootKit/Vendor/stb_image.hxx
@@ -659,7 +659,7 @@ typedef unsigned char validate_uint32[sizeof(stbi__uint32) == 4 ? 1 : -1];
 #ifdef STBI_HAS_LROTL
 #define stbi_lrot(x, y) _lrotl(x, y)
 #else
-#define stbi_lrot(x, y) (((x) << (y)) | ((x) >> (-(y) & 31)))
+#define stbi_lrot(x, y) (((x) << (y)) | ((x) >> (-(y)&31)))
 #endif
 
 #if defined(STBI_MALLOC) && defined(STBI_FREE) && (defined(STBI_REALLOC) || defined(STBI_REALLOC_SIZED))
@@ -1780,7 +1780,7 @@ static stbi__uint32 stbi__get32le(stbi__context* s)
 }
 #endif
 
-#define STBI__BYTECAST(x) ((stbi_uc)((x) & 255)) // truncate int to byte without warnings
+#define STBI__BYTECAST(x) ((stbi_uc)((x)&255)) // truncate int to byte without warnings
 
 #if defined(STBI_NO_JPEG) && defined(STBI_NO_PNG) && defined(STBI_NO_BMP) && defined(STBI_NO_PSD) && defined(STBI_NO_TGA) && defined(STBI_NO_GIF) && defined(STBI_NO_PIC) && defined(STBI_NO_PNM)
 // nothing
@@ -1826,7 +1826,7 @@ static unsigned char* stbi__convert_format(unsigned char* data, int img_n, int r
 		unsigned char* src	= data + j * x * img_n;
 		unsigned char* dest = good + j * x * req_comp;
 
-#define STBI__COMBO(a, b) ((a) * 8 + (b))
+#define STBI__COMBO(a, b) ((a)*8 + (b))
 #define STBI__CASE(a, b)    \
 	case STBI__COMBO(a, b): \
 		for (i = x - 1; i >= 0; --i, src += a, dest += b)
@@ -1951,7 +1951,7 @@ static stbi__uint16* stbi__convert_format16(stbi__uint16* data, int img_n, int r
 		stbi__uint16* src  = data + j * x * img_n;
 		stbi__uint16* dest = good + j * x * req_comp;
 
-#define STBI__COMBO(a, b) ((a) * 8 + (b))
+#define STBI__COMBO(a, b) ((a)*8 + (b))
 #define STBI__CASE(a, b)    \
 	case STBI__COMBO(a, b): \
 		for (i = x - 1; i >= 0; --i, src += a, dest += b)
@@ -2726,8 +2726,8 @@ stbi_inline static stbi_uc stbi__clamp(int x)
 	return (stbi_uc)x;
 }
 
-#define stbi__f2f(x) ((int)(((x) * 4096 + 0.5)))
-#define stbi__fsh(x) ((x) * 4096)
+#define stbi__f2f(x) ((int)(((x)*4096 + 0.5)))
+#define stbi__fsh(x) ((x)*4096)
 
 // derived from jidctint -- DCT_ISLOW
 #define STBI__IDCT_1D(s0, s1, s2, s3, s4, s5, s6, s7)       \
@@ -4159,7 +4159,7 @@ static stbi_uc* stbi__resample_row_generic(stbi_uc* out, stbi_uc* in_near, stbi_
 
 // this is a reduced-precision calculation of YCbCr-to-RGB introduced
 // to make sure the code produces the same results in both SIMD and scalar
-#define stbi__float2fixed(x) (((int)((x) * 4096.0f + 0.5f)) << 8)
+#define stbi__float2fixed(x) (((int)((x)*4096.0f + 0.5f)) << 8)
 static void stbi__YCbCr_to_RGB_row(stbi_uc* out, const stbi_uc* y, const stbi_uc* pcb, const stbi_uc* pcr, int count, int step)
 {
 	int i;
@@ -4503,7 +4503,7 @@ static stbi_uc* load_jpeg_image(stbi__jpeg* z, int* out_x, int* out_y, int* comp
 				coutput[k]			  = r->resample(z->img_comp[k].linebuf,
 											y_bot ? r->line1 : r->line0,
 											y_bot ? r->line0 : r->line1,
-													r->w_lores, r->hs);
+											r->w_lores, r->hs);
 				if (++r->ystep >= r->vs)
 				{
 					r->ystep = 0;
diff --git a/dev/ZBA/Modules/NetBoot/NetBoot.hxx b/dev/ZBA/Modules/NetBoot/NetBoot.hxx
index 42dababa..ff8af0da 100644
--- a/dev/ZBA/Modules/NetBoot/NetBoot.hxx
+++ b/dev/ZBA/Modules/NetBoot/NetBoot.hxx
@@ -19,8 +19,8 @@ typedef struct NetBootInternetHeader
 	Kernel::Char NB3; /// magic char 3 'T'
 	Kernel::Char NB4; /// magic char 4 'B'
 
-	Kernel::Char PatchName[255];	/// example: ColdChoco
-	Kernel::Int32 PatchLength;		/// the patch length.
-	Kernel::Char PatchTarget[255]; /// the target file.
-	Kernel::Boolean	ImpliesROM;		/// does it imply an EEPROM reprogram?
+	Kernel::Char	PatchName[255];	  /// example: ColdChoco
+	Kernel::Int32	PatchLength;	  /// the patch length.
+	Kernel::Char	PatchTarget[255]; /// the target file.
+	Kernel::Boolean ImpliesROM;		  /// does it imply an EEPROM reprogram?
 } NetBootInternetHeader;
diff --git a/dev/ZBA/Sources/HEL/AMD64/BootATA.cxx b/dev/ZBA/Sources/HEL/AMD64/BootATA.cxx
index 0c59ef8c..6cc7f9b7 100644
--- a/dev/ZBA/Sources/HEL/AMD64/BootATA.cxx
+++ b/dev/ZBA/Sources/HEL/AMD64/BootATA.cxx
@@ -111,7 +111,7 @@ ATAInit_Retry:
 
 Void boot_ata_read(UInt64 Lba, UInt16 IO, UInt8 Master, CharacterTypeUTF8* Buf, SizeT SectorSz, SizeT Size)
 {
-    Lba /= SectorSz;
+	Lba /= SectorSz;
 
 	UInt8 Command = ((!Master) ? 0xE0 : 0xF0);
 
@@ -122,7 +122,7 @@ Void boot_ata_read(UInt64 Lba, UInt16 IO, UInt8 Master, CharacterTypeUTF8* Buf,
 
 	Out8(IO + ATA_REG_SEC_COUNT0, ((Size + SectorSz) / SectorSz));
 
-	Out8(IO + ATA_REG_LBA0, (Lba) & 0xFF);
+	Out8(IO + ATA_REG_LBA0, (Lba)&0xFF);
 	Out8(IO + ATA_REG_LBA1, (Lba) >> 8);
 	Out8(IO + ATA_REG_LBA2, (Lba) >> 16);
 	Out8(IO + ATA_REG_LBA3, (Lba) >> 24);
@@ -141,7 +141,7 @@ Void boot_ata_read(UInt64 Lba, UInt16 IO, UInt8 Master, CharacterTypeUTF8* Buf,
 
 Void boot_ata_write(UInt64 Lba, UInt16 IO, UInt8 Master, CharacterTypeUTF8* Buf, SizeT SectorSz, SizeT Size)
 {
-    Lba /= SectorSz;
+	Lba /= SectorSz;
 
 	UInt8 Command = ((!Master) ? 0xE0 : 0xF0);
 
@@ -152,7 +152,7 @@ Void boot_ata_write(UInt64 Lba, UInt16 IO, UInt8 Master, CharacterTypeUTF8* Buf,
 
 	Out8(IO + ATA_REG_SEC_COUNT0, ((Size + (SectorSz)) / SectorSz));
 
-	Out8(IO + ATA_REG_LBA0, (Lba) & 0xFF);
+	Out8(IO + ATA_REG_LBA0, (Lba)&0xFF);
 	Out8(IO + ATA_REG_LBA1, (Lba) >> 8);
 	Out8(IO + ATA_REG_LBA2, (Lba) >> 16);
 	Out8(IO + ATA_REG_LBA3, (Lba) >> 24);
diff --git a/dev/ZBA/Sources/HEL/AMD64/BootMain.cxx b/dev/ZBA/Sources/HEL/AMD64/BootMain.cxx
index 382cbcd6..ff8c3211 100644
--- a/dev/ZBA/Sources/HEL/AMD64/BootMain.cxx
+++ b/dev/ZBA/Sources/HEL/AMD64/BootMain.cxx
@@ -149,8 +149,7 @@ EFI_EXTERN_C EFI_API Int Main(EfiHandlePtr	  ImageHandle,
 	CGDrawString("NEWOSLDR (C) ZKA TECHNOLOGIES.", 10, 10, RGB(0xFF, 0xFF, 0xFF));
 	CGDrawString((cnt_enabled > 1) ? "MULTIPROCESSOR SYSTEM." : "UNIPROCESSOR SYSTEM.", 20, 10, RGB(0xFF, 0xFF, 0xFF));
 
-	handoverHdrPtr->f_HardwareTables.f_MultiProcessingEnabled = cnt_enabled > 1
-	;
+	handoverHdrPtr->f_HardwareTables.f_MultiProcessingEnabled = cnt_enabled > 1;
 	// Fill handover header now.
 
 	BS->GetMemoryMap(&SizePtr, Descriptor, &MapKey, &SzDesc, &RevDesc);
@@ -291,8 +290,8 @@ EFI_EXTERN_C EFI_API Int Main(EfiHandlePtr	  ImageHandle,
 	if (readerSysDrv.Blob() &&
 		chimeWav.Blob())
 	{
-		handoverHdrPtr->f_StartupChime = chimeWav.Blob();
-		handoverHdrPtr->f_StartupImage = readerKernel.Blob();
+		handoverHdrPtr->f_StartupChime	 = chimeWav.Blob();
+		handoverHdrPtr->f_StartupImage	 = readerKernel.Blob();
 		handoverHdrPtr->f_TTFallbackFont = urbanistTTF.Blob();
 	}
 	else
diff --git a/dev/ZBA/Sources/Thread.cxx b/dev/ZBA/Sources/Thread.cxx
index bddbdd52..c7a62a04 100644
--- a/dev/ZBA/Sources/Thread.cxx
+++ b/dev/ZBA/Sources/Thread.cxx
@@ -46,7 +46,7 @@ namespace Boot
 		if (firstBytes[0] == kMagMz0 &&
 			firstBytes[1] == kMagMz1)
 		{
-			LDR_EXEC_HEADER_PTR		  hdrPtr = ldr_find_exec_header(firstBytes);
+			LDR_EXEC_HEADER_PTR		hdrPtr = ldr_find_exec_header(firstBytes);
 			LDR_OPTIONAL_HEADER_PTR optHdr = ldr_find_opt_exec_header(firstBytes);
 
 			if (hdrPtr->mMachine != kPeMachineAMD64 ||
diff --git a/dev/ZKA/CFKit/LoaderUtils.hxx b/dev/ZKA/CFKit/LoaderUtils.hxx
index 248b18b8..7385fc2e 100644
--- a/dev/ZKA/CFKit/LoaderUtils.hxx
+++ b/dev/ZKA/CFKit/LoaderUtils.hxx
@@ -27,10 +27,10 @@ namespace Kernel
 		if (!ptrDos)
 			return nullptr;
 
-        auto exec = ldr_find_exec_header(ptrDos);
+		auto exec = ldr_find_exec_header(ptrDos);
 
-        if (!exec)
-            return nullptr;
+		if (!exec)
+			return nullptr;
 
 		return (LDR_OPTIONAL_HEADER_PTR)(VoidPtr)(&exec->mCharacteristics + 1);
 	}
@@ -39,15 +39,14 @@ namespace Kernel
 	/// @note overloaded function.
 	inline auto ldr_find_exec_header(const Char* ptrDos) -> LDR_EXEC_HEADER_PTR
 	{
-	   return ldr_find_exec_header((DosHeaderPtr)ptrDos);
+		return ldr_find_exec_header((DosHeaderPtr)ptrDos);
 	}
 
-
 	/// @brief Find the PE header inside the blob.
 	/// @note overloaded function.
 	inline auto ldr_find_opt_exec_header(const Char* ptrDos) -> LDR_OPTIONAL_HEADER_PTR
 	{
-	   return ldr_find_opt_exec_header((DosHeaderPtr)ptrDos);
+		return ldr_find_opt_exec_header((DosHeaderPtr)ptrDos);
 	}
 } // namespace Kernel
 
diff --git a/dev/ZKA/CFKit/Property.hxx b/dev/ZKA/CFKit/Property.hxx
index 602c061f..eb9b4816 100644
--- a/dev/ZKA/CFKit/Property.hxx
+++ b/dev/ZKA/CFKit/Property.hxx
@@ -24,7 +24,7 @@ namespace Kernel
 	class Property
 	{
 	public:
-	    Property() = default;
+		Property() = default;
 		virtual ~Property();
 
 	public:
@@ -36,8 +36,8 @@ namespace Kernel
 		StringView& GetKey();
 
 	private:
-		StringView      fName{cMaxPropLen};
-		PropertyId		fAction{No};
+		StringView fName{cMaxPropLen};
+		PropertyId fAction{No};
 	};
 
 	template <SizeT N>
diff --git a/dev/ZKA/CompilerKit/Detail.hxx b/dev/ZKA/CompilerKit/Detail.hxx
index fd9cf7a3..d0b8d153 100644
--- a/dev/ZKA/CompilerKit/Detail.hxx
+++ b/dev/ZKA/CompilerKit/Detail.hxx
@@ -10,18 +10,18 @@
 #include <NewKit/Defines.hxx>
 #endif // ifdef __NEWOSKRNL__
 
-#define ZKA_COPY_DELETE(KLASS)             \
+#define ZKA_COPY_DELETE(KLASS)               \
 	KLASS& operator=(const KLASS&) = delete; \
 	KLASS(const KLASS&)			   = delete;
 
-#define ZKA_COPY_DEFAULT(KLASS)             \
+#define ZKA_COPY_DEFAULT(KLASS)               \
 	KLASS& operator=(const KLASS&) = default; \
 	KLASS(const KLASS&)			   = default;
 
-#define ZKA_MOVE_DELETE(KLASS)        \
+#define ZKA_MOVE_DELETE(KLASS)          \
 	KLASS& operator=(KLASS&&) = delete; \
 	KLASS(KLASS&&)			  = delete;
 
-#define ZKA_MOVE_DEFAULT(KLASS)        \
+#define ZKA_MOVE_DEFAULT(KLASS)          \
 	KLASS& operator=(KLASS&&) = default; \
 	KLASS(KLASS&&)			  = default;
diff --git a/dev/ZKA/FSKit/NewFS.hxx b/dev/ZKA/FSKit/NewFS.hxx
index c3ae7091..c5ada14b 100644
--- a/dev/ZKA/FSKit/NewFS.hxx
+++ b/dev/ZKA/FSKit/NewFS.hxx
@@ -31,7 +31,7 @@ default.
 #define kNewFSNodeNameLen	 (256)
 
 #define kNewFSSectorSz (512)
-#define kNewFSForkSz (8192)
+#define kNewFSForkSz   (8192)
 
 #define kNewFSIdentLen (8)
 #define kNewFSIdent	   " NewFS"
@@ -86,8 +86,8 @@ default.
 #define kNewFSLbaType  (Kernel::Lba)
 
 /// Start After the PM headers, pad 1024 bytes.
-#define kNewFSRootCatalogStartAddress			  (1024)
-#define kNewFSCatalogStartAddress ((2048) + sizeof(NFS_ROOT_PARTITION_BLOCK))
+#define kNewFSRootCatalogStartAddress (1024)
+#define kNewFSCatalogStartAddress	  ((2048) + sizeof(NFS_ROOT_PARTITION_BLOCK))
 
 #define kResourceTypeDialog (10)
 #define kResourceTypeString (11)
@@ -267,7 +267,7 @@ namespace Kernel
 
 		VoidPtr ReadCatalog(_Input _Output NFS_CATALOG_STRUCT* catalog,
 							_Input Bool						   isRsrcFork,
-							_Input SizeT							   dataSz,
+							_Input SizeT					   dataSz,
 							_Input const Char* forkName);
 
 		bool Seek(_Input _Output NFS_CATALOG_STRUCT* catalog, SizeT off);
diff --git a/dev/ZKA/FirmwareKit/EFI/EFI.hxx b/dev/ZKA/FirmwareKit/EFI/EFI.hxx
index 13ddec1c..be319336 100644
--- a/dev/ZKA/FirmwareKit/EFI/EFI.hxx
+++ b/dev/ZKA/FirmwareKit/EFI/EFI.hxx
@@ -865,7 +865,7 @@ typedef EfiStatusType EFI_API (*EFI_MP_SERVICES_ENABLEDISABLEAP)(
 	IN Boolean						  EnableAP,
 	IN UInt32* HealthFlag OPTIONAL);
 
-typedef EfiStatusType EFI_API(* EFI_MP_SERVICES_WHOAMI)(
+typedef EfiStatusType EFI_API (*EFI_MP_SERVICES_WHOAMI)(
 	IN struct _EfiMpServicesProtocol* This,
 	OUT UInt32* ProcessorNumber);
 
diff --git a/dev/ZKA/FirmwareKit/EPM.hxx b/dev/ZKA/FirmwareKit/EPM.hxx
index e7b14b01..0de288be 100644
--- a/dev/ZKA/FirmwareKit/EPM.hxx
+++ b/dev/ZKA/FirmwareKit/EPM.hxx
@@ -92,18 +92,18 @@ typedef struct _BLOCK_GUID_STRUCT
  */
 struct PACKED _BOOT_BLOCK_STRUCT
 {
-	Kernel::Char  Magic[kEPMMagicLength];
-	Kernel::Char  Name[kEPMNameLength];
-	BLOCK_GUID_STRUCT	  Uuid;
-	Kernel::Int32 Version;
-	Kernel::Int64 NumBlocks;
-	Kernel::Int64 SectorSz;
-	Kernel::Int64 LbaStart; // base offset
-	Kernel::Int64 LbaEnd; // addition of lba_start to get the end of partition.
-	Kernel::Int16 Kind;
-	Kernel::Int32 FsVersion;
-	Kernel::Char  Fs[kEPMFilesystemLength]; /* NewFS, ffs2... */
-	Kernel::Char  Reserved[401];			// to fill a full sector.
+	Kernel::Char	  Magic[kEPMMagicLength];
+	Kernel::Char	  Name[kEPMNameLength];
+	BLOCK_GUID_STRUCT Uuid;
+	Kernel::Int32	  Version;
+	Kernel::Int64	  NumBlocks;
+	Kernel::Int64	  SectorSz;
+	Kernel::Int64	  LbaStart; // base offset
+	Kernel::Int64	  LbaEnd;	// addition of lba_start to get the end of partition.
+	Kernel::Int16	  Kind;
+	Kernel::Int32	  FsVersion;
+	Kernel::Char	  Fs[kEPMFilesystemLength]; /* NewFS, ffs2... */
+	Kernel::Char	  Reserved[401];			// to fill a full sector.
 };
 
 ///! @brief Version kind enum.
diff --git a/dev/ZKA/HALKit/AMD64/CPUID.hxx b/dev/ZKA/HALKit/AMD64/CPUID.hxx
index f5ae5bb5..ae6e42c5 100644
--- a/dev/ZKA/HALKit/AMD64/CPUID.hxx
+++ b/dev/ZKA/HALKit/AMD64/CPUID.hxx
@@ -15,67 +15,67 @@
 
 enum
 {
-	eCPU_FEATURE_ECX_SSE3	   = 1 << 0,
-	eCPU_FEATURE_ECX_PCLMUL	   = 1 << 1,
-	eCPU_FEATURE_ECX_DTES64	   = 1 << 2,
-	eCPU_FEATURE_ECX_MONITOR	   = 1 << 3,
-	eCPU_FEATURE_ECX_DS_CPL	   = 1 << 4,
-	eCPU_FEATURE_ECX_VMX		   = 1 << 5,
-	eCPU_FEATURE_ECX_SMX		   = 1 << 6,
-	eCPU_FEATURE_ECX_EST		   = 1 << 7,
-	eCPU_FEATURE_ECX_TM2		   = 1 << 8,
-	eCPU_FEATURE_ECX_SSSE3	   = 1 << 9,
-	eCPU_FEATURE_ECX_CID		   = 1 << 10,
-	eCPU_FEATURE_ECX_SDBG	   = 1 << 11,
-	eCPU_FEATURE_ECX_FMA		   = 1 << 12,
-	eCPU_FEATURE_ECX_CX16	   = 1 << 13,
-	eCPU_FEATURE_ECX_XTPR	   = 1 << 14,
-	eCPU_FEATURE_ECX_PDCM	   = 1 << 15,
-	eCPU_FEATURE_ECX_PCID	   = 1 << 17,
-	eCPU_FEATURE_ECX_DCA		   = 1 << 18,
-	eCPU_FEATURE_ECX_SSE4_1	   = 1 << 19,
-	eCPU_FEATURE_ECX_SSE4_2	   = 1 << 20,
-	eCPU_FEATURE_ECX_X2APIC	   = 1 << 21,
-	eCPU_FEATURE_ECX_MOVBE	   = 1 << 22,
-	eCPU_FEATURE_ECX_POP3C	   = 1 << 23,
-	eCPU_FEATURE_ECX_TSC		   = 1 << 24,
-	eCPU_FEATURE_ECX_AES		   = 1 << 25,
-	eCPU_FEATURE_ECX_XSAVE	   = 1 << 26,
-	eCPU_FEATURE_ECX_OSXSAVE	   = 1 << 27,
-	eCPU_FEATURE_ECX_AVX		   = 1 << 28,
-	eCPU_FEATURE_ECX_F16C	   = 1 << 29,
-	eCPU_FEATURE_ECX_RDRAND	   = 1 << 30,
+	eCPU_FEATURE_ECX_SSE3		= 1 << 0,
+	eCPU_FEATURE_ECX_PCLMUL		= 1 << 1,
+	eCPU_FEATURE_ECX_DTES64		= 1 << 2,
+	eCPU_FEATURE_ECX_MONITOR	= 1 << 3,
+	eCPU_FEATURE_ECX_DS_CPL		= 1 << 4,
+	eCPU_FEATURE_ECX_VMX		= 1 << 5,
+	eCPU_FEATURE_ECX_SMX		= 1 << 6,
+	eCPU_FEATURE_ECX_EST		= 1 << 7,
+	eCPU_FEATURE_ECX_TM2		= 1 << 8,
+	eCPU_FEATURE_ECX_SSSE3		= 1 << 9,
+	eCPU_FEATURE_ECX_CID		= 1 << 10,
+	eCPU_FEATURE_ECX_SDBG		= 1 << 11,
+	eCPU_FEATURE_ECX_FMA		= 1 << 12,
+	eCPU_FEATURE_ECX_CX16		= 1 << 13,
+	eCPU_FEATURE_ECX_XTPR		= 1 << 14,
+	eCPU_FEATURE_ECX_PDCM		= 1 << 15,
+	eCPU_FEATURE_ECX_PCID		= 1 << 17,
+	eCPU_FEATURE_ECX_DCA		= 1 << 18,
+	eCPU_FEATURE_ECX_SSE4_1		= 1 << 19,
+	eCPU_FEATURE_ECX_SSE4_2		= 1 << 20,
+	eCPU_FEATURE_ECX_X2APIC		= 1 << 21,
+	eCPU_FEATURE_ECX_MOVBE		= 1 << 22,
+	eCPU_FEATURE_ECX_POP3C		= 1 << 23,
+	eCPU_FEATURE_ECX_TSC		= 1 << 24,
+	eCPU_FEATURE_ECX_AES		= 1 << 25,
+	eCPU_FEATURE_ECX_XSAVE		= 1 << 26,
+	eCPU_FEATURE_ECX_OSXSAVE	= 1 << 27,
+	eCPU_FEATURE_ECX_AVX		= 1 << 28,
+	eCPU_FEATURE_ECX_F16C		= 1 << 29,
+	eCPU_FEATURE_ECX_RDRAND		= 1 << 30,
 	eCPU_FEATURE_ECX_HYPERVISOR = 1 << 31,
-	eCPU_FEATURE_EDX_FPU		   = 1 << 0,
-	eCPU_FEATURE_EDX_VME		   = 1 << 1,
-	eCPU_FEATURE_EDX_DE		   = 1 << 2,
-	eCPU_FEATURE_EDX_PSE		   = 1 << 3,
-	eCPU_FEATURE_EDX_TSC		   = 1 << 4,
-	eCPU_FEATURE_EDX_MSR		   = 1 << 5,
-	eCPU_FEATURE_EDX_PAE		   = 1 << 6,
-	eCPU_FEATURE_EDX_MCE		   = 1 << 7,
-	eCPU_FEATURE_EDX_CX8		   = 1 << 8,
-	eCPU_FEATURE_EDX_APIC	   = 1 << 9,
-	eCPU_FEATURE_EDX_SEP		   = 1 << 11,
-	eCPU_FEATURE_EDX_MTRR	   = 1 << 12,
-	eCPU_FEATURE_EDX_PGE		   = 1 << 13,
-	eCPU_FEATURE_EDX_MCA		   = 1 << 14,
-	eCPU_FEATURE_EDX_CMOV	   = 1 << 15,
-	eCPU_FEATURE_EDX_PAT		   = 1 << 16,
-	eCPU_FEATURE_EDX_PSE36	   = 1 << 17,
-	eCPU_FEATURE_EDX_PSN		   = 1 << 18,
-	eCPU_FEATURE_EDX_CLFLUSH	   = 1 << 19,
-	eCPU_FEATURE_EDX_DS		   = 1 << 21,
-	eCPU_FEATURE_EDX_ACPI	   = 1 << 22,
-	eCPU_FEATURE_EDX_MMX		   = 1 << 23,
-	eCPU_FEATURE_EDX_FXSR	   = 1 << 24,
-	eCPU_FEATURE_EDX_SSE		   = 1 << 25,
-	eCPU_FEATURE_EDX_SSE2	   = 1 << 26,
-	eCPU_FEATURE_EDX_SS		   = 1 << 27,
-	eCPU_FEATURE_EDX_HTT		   = 1 << 28,
-	eCPU_FEATURE_EDX_TM		   = 1 << 29,
-	eCPU_FEATURE_EDX_IA64	   = 1 << 30,
-	eCPU_FEATURE_EDX_PBE		   = 1 << 31
+	eCPU_FEATURE_EDX_FPU		= 1 << 0,
+	eCPU_FEATURE_EDX_VME		= 1 << 1,
+	eCPU_FEATURE_EDX_DE			= 1 << 2,
+	eCPU_FEATURE_EDX_PSE		= 1 << 3,
+	eCPU_FEATURE_EDX_TSC		= 1 << 4,
+	eCPU_FEATURE_EDX_MSR		= 1 << 5,
+	eCPU_FEATURE_EDX_PAE		= 1 << 6,
+	eCPU_FEATURE_EDX_MCE		= 1 << 7,
+	eCPU_FEATURE_EDX_CX8		= 1 << 8,
+	eCPU_FEATURE_EDX_APIC		= 1 << 9,
+	eCPU_FEATURE_EDX_SEP		= 1 << 11,
+	eCPU_FEATURE_EDX_MTRR		= 1 << 12,
+	eCPU_FEATURE_EDX_PGE		= 1 << 13,
+	eCPU_FEATURE_EDX_MCA		= 1 << 14,
+	eCPU_FEATURE_EDX_CMOV		= 1 << 15,
+	eCPU_FEATURE_EDX_PAT		= 1 << 16,
+	eCPU_FEATURE_EDX_PSE36		= 1 << 17,
+	eCPU_FEATURE_EDX_PSN		= 1 << 18,
+	eCPU_FEATURE_EDX_CLFLUSH	= 1 << 19,
+	eCPU_FEATURE_EDX_DS			= 1 << 21,
+	eCPU_FEATURE_EDX_ACPI		= 1 << 22,
+	eCPU_FEATURE_EDX_MMX		= 1 << 23,
+	eCPU_FEATURE_EDX_FXSR		= 1 << 24,
+	eCPU_FEATURE_EDX_SSE		= 1 << 25,
+	eCPU_FEATURE_EDX_SSE2		= 1 << 26,
+	eCPU_FEATURE_EDX_SS			= 1 << 27,
+	eCPU_FEATURE_EDX_HTT		= 1 << 28,
+	eCPU_FEATURE_EDX_TM			= 1 << 29,
+	eCPU_FEATURE_EDX_IA64		= 1 << 30,
+	eCPU_FEATURE_EDX_PBE		= 1 << 31
 };
 
 typedef long long int hal_cpu_feature_type;
\ No newline at end of file
diff --git a/dev/ZKA/HALKit/AMD64/HalCoreInterruptHandlerAMD64.cxx b/dev/ZKA/HALKit/AMD64/HalCoreInterruptHandlerAMD64.cxx
index 6d5396f2..7838a8ed 100644
--- a/dev/ZKA/HALKit/AMD64/HalCoreInterruptHandlerAMD64.cxx
+++ b/dev/ZKA/HALKit/AMD64/HalCoreInterruptHandlerAMD64.cxx
@@ -12,14 +12,14 @@
 /// @param rsp
 EXTERN_C void idt_handle_gpf(Kernel::UIntPtr rsp)
 {
-    Kernel::UserProcessScheduler::The().CurrentProcess().Leak().Crash();
+	Kernel::UserProcessScheduler::The().CurrentProcess().Leak().Crash();
 }
 
 /// @brief Handle page fault.
 /// @param rsp
 EXTERN_C void idt_handle_pf(Kernel::UIntPtr rsp)
 {
-    Kernel::UserProcessScheduler::The().CurrentProcess().Leak().Crash();
+	Kernel::UserProcessScheduler::The().CurrentProcess().Leak().Crash();
 	Kernel::ke_stop(RUNTIME_CHECK_PROCESS);
 }
 
@@ -27,7 +27,7 @@ EXTERN_C void idt_handle_pf(Kernel::UIntPtr rsp)
 /// @param rsp
 EXTERN_C void idt_handle_math(Kernel::UIntPtr rsp)
 {
-    Kernel::UserProcessScheduler::The().CurrentProcess().Leak().Crash();
+	Kernel::UserProcessScheduler::The().CurrentProcess().Leak().Crash();
 	Kernel::ke_stop(RUNTIME_CHECK_PROCESS);
 }
 
@@ -35,7 +35,7 @@ EXTERN_C void idt_handle_math(Kernel::UIntPtr rsp)
 /// @param rsp
 EXTERN_C void idt_handle_generic(Kernel::UIntPtr rsp)
 {
-    Kernel::UserProcessScheduler::The().CurrentProcess().Leak().Crash();
+	Kernel::UserProcessScheduler::The().CurrentProcess().Leak().Crash();
 	Kernel::ke_stop(RUNTIME_CHECK_PROCESS);
 }
 
@@ -43,7 +43,7 @@ EXTERN_C void idt_handle_generic(Kernel::UIntPtr rsp)
 /// @param rsp
 EXTERN_C void idt_handle_ud(Kernel::UIntPtr rsp)
 {
-    Kernel::UserProcessScheduler::The().CurrentProcess().Leak().Crash();
+	Kernel::UserProcessScheduler::The().CurrentProcess().Leak().Crash();
 	Kernel::ke_stop(RUNTIME_CHECK_PROCESS);
 }
 
diff --git a/dev/ZKA/HALKit/AMD64/HalCoreMPScheduler.cxx b/dev/ZKA/HALKit/AMD64/HalCoreMPScheduler.cxx
index a6a27695..9a7e276c 100644
--- a/dev/ZKA/HALKit/AMD64/HalCoreMPScheduler.cxx
+++ b/dev/ZKA/HALKit/AMD64/HalCoreMPScheduler.cxx
@@ -146,7 +146,7 @@ namespace Kernel::HAL
 
 	struct PROCESS_CONTROL_BLOCK final
 	{
-		UserProcessPtr	   f_Process;
+		UserProcessPtr f_Process;
 	} fBlocks[kSchedProcessLimitPerTeam] = {0};
 
 	EXTERN_C HAL::StackFramePtr _hal_leak_current_context(Void)
@@ -158,7 +158,7 @@ namespace Kernel::HAL
 	{
 		if (kSMPAware)
 		{
-			fBlocks[UserProcessScheduler::The().CurrentProcess().Leak().ProcessId % kSchedProcessLimitPerTeam].f_Process   = &UserProcessScheduler::The().CurrentProcess().Leak();
+			fBlocks[UserProcessScheduler::The().CurrentProcess().Leak().ProcessId % kSchedProcessLimitPerTeam].f_Process = &UserProcessScheduler::The().CurrentProcess().Leak();
 
 			return true;
 		}
diff --git a/dev/ZKA/HALKit/AMD64/HalDebugOutput.cxx b/dev/ZKA/HALKit/AMD64/HalDebugOutput.cxx
index ee5bb2ea..296bbcec 100644
--- a/dev/ZKA/HALKit/AMD64/HalDebugOutput.cxx
+++ b/dev/ZKA/HALKit/AMD64/HalDebugOutput.cxx
@@ -78,7 +78,7 @@ namespace Kernel
 		SizeT len	= 0;
 
 		index = 0;
-		len	= rt_string_len(bytes, 255);
+		len	  = rt_string_len(bytes, 255);
 
 		while (index < len)
 		{
diff --git a/dev/ZKA/HALKit/AMD64/HalDescriptorLoader.cxx b/dev/ZKA/HALKit/AMD64/HalDescriptorLoader.cxx
index adf8de2e..3b91aa88 100644
--- a/dev/ZKA/HALKit/AMD64/HalDescriptorLoader.cxx
+++ b/dev/ZKA/HALKit/AMD64/HalDescriptorLoader.cxx
@@ -55,11 +55,11 @@ namespace Kernel::HAL
 		{
 			MUST_PASS(ptr_ivt[idt_indx]);
 
-			Detail::kInterruptVectorTable[idt_indx].Selector		= idt_indx == kSyscallRoute ? kGdtUserCodeSelector : kGdtCodeSelector;
-			Detail::kInterruptVectorTable[idt_indx].Ist			= 0;
+			Detail::kInterruptVectorTable[idt_indx].Selector	   = idt_indx == kSyscallRoute ? kGdtUserCodeSelector : kGdtCodeSelector;
+			Detail::kInterruptVectorTable[idt_indx].Ist			   = 0;
 			Detail::kInterruptVectorTable[idt_indx].TypeAttributes = kInterruptGate;
-			Detail::kInterruptVectorTable[idt_indx].OffsetLow		= ((UIntPtr)ptr_ivt[idt_indx] & __INT16_MAX__);
-			Detail::kInterruptVectorTable[idt_indx].OffsetMid		= (((UIntPtr)ptr_ivt[idt_indx] >> 16) & __INT16_MAX__);
+			Detail::kInterruptVectorTable[idt_indx].OffsetLow	   = ((UIntPtr)ptr_ivt[idt_indx] & __INT16_MAX__);
+			Detail::kInterruptVectorTable[idt_indx].OffsetMid	   = (((UIntPtr)ptr_ivt[idt_indx] >> 16) & __INT16_MAX__);
 			Detail::kInterruptVectorTable[idt_indx].OffsetHigh =
 				(((UIntPtr)ptr_ivt[idt_indx] >> 32) & __INT32_MAX__);
 
diff --git a/dev/ZKA/HALKit/AMD64/HalKernelMain.cxx b/dev/ZKA/HALKit/AMD64/HalKernelMain.cxx
index 2f79c173..faf59920 100644
--- a/dev/ZKA/HALKit/AMD64/HalKernelMain.cxx
+++ b/dev/ZKA/HALKit/AMD64/HalKernelMain.cxx
@@ -69,10 +69,10 @@ STATIC Kernel::HAL::Detail::ZKA_GDT_ENTRY cGdt[9] = {
 	{.fLimit0 = 0xFFFF, .fBase0 = 0, .fBase1 = 00, .fAccessByte = 0xFA, .fGranularity = 0xA0, .fBase2 = 0}, // User code
 	{.fLimit0 = 0xFFFF, .fBase0 = 0, .fBase1 = 00, .fAccessByte = 0xF2, .fGranularity = 0xA0, .fBase2 = 0}, // User data
 	// reserve them for later.
-	{.fLimit0 = 0, .fBase0 = 0, .fBase1 = 0, .fAccessByte = 0x00, .fGranularity = 0x00, .fBase2 = 0},		// Null entry
-	{.fLimit0 = 0, .fBase0 = 0, .fBase1 = 0, .fAccessByte = 0x00, .fGranularity = 0x00, .fBase2 = 0},	
-	{.fLimit0 = 0, .fBase0 = 0, .fBase1 = 0, .fAccessByte = 0x00, .fGranularity = 0x00, .fBase2 = 0},	
-	{.fLimit0 = 0, .fBase0 = 0, .fBase1 = 0, .fAccessByte = 0x00, .fGranularity = 0x00, .fBase2 = 0},	
+	{.fLimit0 = 0, .fBase0 = 0, .fBase1 = 0, .fAccessByte = 0x00, .fGranularity = 0x00, .fBase2 = 0}, // Null entry
+	{.fLimit0 = 0, .fBase0 = 0, .fBase1 = 0, .fAccessByte = 0x00, .fGranularity = 0x00, .fBase2 = 0},
+	{.fLimit0 = 0, .fBase0 = 0, .fBase1 = 0, .fAccessByte = 0x00, .fGranularity = 0x00, .fBase2 = 0},
+	{.fLimit0 = 0, .fBase0 = 0, .fBase1 = 0, .fAccessByte = 0x00, .fGranularity = 0x00, .fBase2 = 0},
 };
 
 Kernel::Void hal_real_init(Kernel::Void) noexcept;
diff --git a/dev/ZKA/HALKit/AMD64/HalPageAlloc.cxx b/dev/ZKA/HALKit/AMD64/HalPageAlloc.cxx
index b0a490ed..4a830eee 100644
--- a/dev/ZKA/HALKit/AMD64/HalPageAlloc.cxx
+++ b/dev/ZKA/HALKit/AMD64/HalPageAlloc.cxx
@@ -135,10 +135,10 @@ namespace Kernel
 				return false;
 
 			Detail::VIRTUAL_MEMORY_HEADER* result = reinterpret_cast<Detail::VIRTUAL_MEMORY_HEADER*>((UIntPtr)page_ptr - sizeof(Detail::VIRTUAL_MEMORY_HEADER));
-			
+
 			if (result->Magic != cVMHMagic)
 				return false;
-			
+
 			if (result->Present != true)
 				return true;
 
diff --git a/dev/ZKA/HALKit/AMD64/HalPageAlloc.hxx b/dev/ZKA/HALKit/AMD64/HalPageAlloc.hxx
index 0cfa5ed8..11a267e2 100644
--- a/dev/ZKA/HALKit/AMD64/HalPageAlloc.hxx
+++ b/dev/ZKA/HALKit/AMD64/HalPageAlloc.hxx
@@ -93,6 +93,6 @@ namespace Kernel::HAL
 
 namespace Kernel
 {
-	typedef HAL::ZKA_PTE	 PTE;
+	typedef HAL::ZKA_PTE PTE;
 	typedef HAL::ZKA_PDE PDE;
 } // namespace Kernel
diff --git a/dev/ZKA/HALKit/AMD64/HalTimer.cxx b/dev/ZKA/HALKit/AMD64/HalTimer.cxx
index 48e62ee9..4a5d38cf 100644
--- a/dev/ZKA/HALKit/AMD64/HalTimer.cxx
+++ b/dev/ZKA/HALKit/AMD64/HalTimer.cxx
@@ -17,10 +17,10 @@
 

 // timer slot 0

 

-#define cHPETCounterRegValue (0x00)

-#define cHPETConfigRegValue  (0x20)

-#define cHPETCompRegValue	  (0x24)

-#define cHPETInterruptRegValue	  (0x2C)

+#define cHPETCounterRegValue   (0x00)

+#define cHPETConfigRegValue	   (0x20)

+#define cHPETCompRegValue	   (0x24)

+#define cHPETInterruptRegValue (0x2C)

 

 ///! BUGS: 0

 ///! @file HalTimer.cxx

@@ -36,7 +36,7 @@ namespace Kernel::Detail
 		Kernel::UInt8  reserved : 1;

 		Kernel::UInt8  legacy_replacement : 1;

 		Kernel::UInt16 pci_vendor_id;

-		ACPI_ADDRESS address;

+		ACPI_ADDRESS   address;

 		Kernel::UInt8  hpet_number;

 		Kernel::UInt16 minimum_tick;

 		Kernel::UInt8  page_protection;

@@ -75,11 +75,12 @@ Int32 HardwareTimer::Wait() noexcept
 	}

 

 	UInt64 ticks = fWaitFor / ((*(fDigitalTimer) >> 32) & __UINT32_MAX__);

-	UInt64 prev = *(fDigitalTimer + cHPETCounterRegValue);

+	UInt64 prev	 = *(fDigitalTimer + cHPETCounterRegValue);

 

 	prev += ticks;

 

-	while (*(fDigitalTimer + cHPETCounterRegValue) < (ticks));

+	while (*(fDigitalTimer + cHPETCounterRegValue) < (ticks))

+		;

 

 	return 0;

 }

diff --git a/dev/ZKA/HALKit/AMD64/Storage/ATA-PIO.cxx b/dev/ZKA/HALKit/AMD64/Storage/ATA-PIO.cxx
index 6dc252fc..35773924 100644
--- a/dev/ZKA/HALKit/AMD64/Storage/ATA-PIO.cxx
+++ b/dev/ZKA/HALKit/AMD64/Storage/ATA-PIO.cxx
@@ -80,7 +80,7 @@ ATAInit_Retry:
 
 	if (statRdy & ATA_SR_ERR)
 	{
-	Kernel::kcout << "newoskrnl.dll: Failing drive...\r";
+		Kernel::kcout << "newoskrnl.dll: Failing drive...\r";
 
 		return false;
 	}
@@ -114,7 +114,7 @@ ATAInit_Retry:
 
 Void drv_std_read(UInt64 Lba, UInt16 IO, UInt8 Master, Char* Buf, SizeT SectorSz, SizeT Size)
 {
-    Lba /= SectorSz;
+	Lba /= SectorSz;
 
 	UInt8 Command = ((!Master) ? 0xE0 : 0xF0);
 
@@ -125,7 +125,7 @@ Void drv_std_read(UInt64 Lba, UInt16 IO, UInt8 Master, Char* Buf, SizeT SectorSz
 
 	Out8(IO + ATA_REG_SEC_COUNT0, ((Size + SectorSz) / SectorSz));
 
-	Out8(IO + ATA_REG_LBA0, (Lba) & 0xFF);
+	Out8(IO + ATA_REG_LBA0, (Lba)&0xFF);
 	Out8(IO + ATA_REG_LBA1, (Lba) >> 8);
 	Out8(IO + ATA_REG_LBA2, (Lba) >> 16);
 	Out8(IO + ATA_REG_LBA3, (Lba) >> 24);
@@ -146,7 +146,7 @@ Void drv_std_read(UInt64 Lba, UInt16 IO, UInt8 Master, Char* Buf, SizeT SectorSz
 
 Void drv_std_write(UInt64 Lba, UInt16 IO, UInt8 Master, Char* Buf, SizeT SectorSz, SizeT Size)
 {
-    Lba /= SectorSz;
+	Lba /= SectorSz;
 
 	UInt8 Command = ((!Master) ? 0xE0 : 0xF0);
 
@@ -157,7 +157,7 @@ Void drv_std_write(UInt64 Lba, UInt16 IO, UInt8 Master, Char* Buf, SizeT SectorS
 
 	Out8(IO + ATA_REG_SEC_COUNT0, ((Size + (SectorSz)) / SectorSz));
 
-	Out8(IO + ATA_REG_LBA0, (Lba) & 0xFF);
+	Out8(IO + ATA_REG_LBA0, (Lba)&0xFF);
 	Out8(IO + ATA_REG_LBA1, (Lba) >> 8);
 	Out8(IO + ATA_REG_LBA2, (Lba) >> 16);
 	Out8(IO + ATA_REG_LBA3, (Lba) >> 24);
diff --git a/dev/ZKA/HALKit/ARM64/HalKernelMain.cxx b/dev/ZKA/HALKit/ARM64/HalKernelMain.cxx
index eed255da..9145eec0 100644
--- a/dev/ZKA/HALKit/ARM64/HalKernelMain.cxx
+++ b/dev/ZKA/HALKit/ARM64/HalKernelMain.cxx
@@ -22,7 +22,7 @@
 #include <Modules/CoreCG/TextRenderer.hxx>
 
 Kernel::Property cKernelVersion;
-Kernel::User cUserSuper{Kernel::RingKind::kRingSuperUser, kSuperUser};
+Kernel::User	 cUserSuper{Kernel::RingKind::kRingSuperUser, kSuperUser};
 
 EXTERN Kernel::Boolean kAllocationInProgress;
 
diff --git a/dev/ZKA/HALKit/ARM64/Processor.hxx b/dev/ZKA/HALKit/ARM64/Processor.hxx
index 2378daca..be4e7e3e 100644
--- a/dev/ZKA/HALKit/ARM64/Processor.hxx
+++ b/dev/ZKA/HALKit/ARM64/Processor.hxx
@@ -44,7 +44,6 @@ namespace Kernel::HAL
 	typedef StackFrame* StackFramePtr;
 } // namespace Kernel::HAL
 
-
 inline Kernel::VoidPtr kKernelVMHStart	   = nullptr;
 inline Kernel::VoidPtr kKernelVirtualStart = nullptr;
 inline Kernel::UIntPtr kKernelVirtualSize  = 0UL;
diff --git a/dev/ZKA/KernelKit/DeviceManager.hxx b/dev/ZKA/KernelKit/DeviceManager.hxx
index 3b6e3e54..5164ae28 100644
--- a/dev/ZKA/KernelKit/DeviceManager.hxx
+++ b/dev/ZKA/KernelKit/DeviceManager.hxx
@@ -74,7 +74,7 @@ namespace Kernel
 
 	private:
 		Void (*fOut)(T Data) = {nullptr};
-		Void (*fIn)(T Data) = {nullptr};
+		Void (*fIn)(T Data)	 = {nullptr};
 	};
 
 	///
diff --git a/dev/ZKA/KernelKit/FileManager.hxx b/dev/ZKA/KernelKit/FileManager.hxx
index daaf65b3..32295241 100644
--- a/dev/ZKA/KernelKit/FileManager.hxx
+++ b/dev/ZKA/KernelKit/FileManager.hxx
@@ -101,7 +101,7 @@ namespace Kernel
 		virtual NodePtr Create(_Input const Char* path)			 = 0;
 		virtual NodePtr CreateAlias(_Input const Char* path)	 = 0;
 		virtual NodePtr CreateDirectory(_Input const Char* path) = 0;
-		virtual NodePtr CreateSwapFile(const Char* path) = 0;
+		virtual NodePtr CreateSwapFile(const Char* path)		 = 0;
 
 	public:
 		virtual bool Remove(_Input const Char* path) = 0;
@@ -375,7 +375,7 @@ namespace Kernel
 			Int32 fMappedTo;
 		};
 
-		const SizeT		cRestrictCount	= cRestrictMax;
+		const SizeT		   cRestrictCount  = cRestrictMax;
 		const RESTRICT_MAP cRestrictList[] = {
 			{
 				.fRestrict = cRestrictR,
diff --git a/dev/ZKA/KernelKit/LoaderInterface.hxx b/dev/ZKA/KernelKit/LoaderInterface.hxx
index 816b6897..ab251bec 100644
--- a/dev/ZKA/KernelKit/LoaderInterface.hxx
+++ b/dev/ZKA/KernelKit/LoaderInterface.hxx
@@ -24,7 +24,7 @@ namespace Kernel
 		ZKA_COPY_DEFAULT(LoaderInterface);
 
 	public:
-		virtual _Output const Char* AsString()											= 0;
+		virtual _Output const Char* AsString()													= 0;
 		virtual _Output const Char* MIME()														= 0;
 		virtual _Output const Char* Path()														= 0;
 		virtual _Output ErrorOr<VoidPtr> FindStart()											= 0;
diff --git a/dev/ZKA/KernelKit/MP.hxx b/dev/ZKA/KernelKit/MP.hxx
index 6de796ea..51f3472a 100644
--- a/dev/ZKA/KernelKit/MP.hxx
+++ b/dev/ZKA/KernelKit/MP.hxx
@@ -63,18 +63,18 @@ namespace Kernel
 		bool IsWakeup() noexcept;
 
 	public:
-		HAL::StackFramePtr  StackFrame() noexcept;
-		const ThreadKind& Kind() noexcept;
-		bool			  IsBusy() noexcept;
-		const ThreadID&	  ID() noexcept;
+		HAL::StackFramePtr StackFrame() noexcept;
+		const ThreadKind&  Kind() noexcept;
+		bool			   IsBusy() noexcept;
+		const ThreadID&	   ID() noexcept;
 
 	private:
 		HAL::StackFramePtr fStack{nullptr};
-		ThreadKind		 fKind{ThreadKind::kHartStandard};
-		ThreadID		 fID{0};
-		ProcessID		 fSourcePID{-1};
-		bool			 fWakeup{false};
-		bool			 fBusy{false};
+		ThreadKind		   fKind{ThreadKind::kHartStandard};
+		ThreadID		   fID{0};
+		ProcessID		   fSourcePID{-1};
+		bool			   fWakeup{false};
+		bool			   fBusy{false};
 
 	private:
 		friend class HardwareThreadScheduler;
@@ -100,7 +100,7 @@ namespace Kernel
 	public:
 		Ref<HardwareThread*> operator[](const SizeT& idx);
 		bool				 operator!() noexcept;
-		operator bool() noexcept;
+							 operator bool() noexcept;
 
 	public:
 		/// @brief Shared instance of the MP Manager.
@@ -114,7 +114,7 @@ namespace Kernel
 
 	private:
 		Array<HardwareThread, cMaxHWThreads> fThreadList;
-		ThreadID						 fCurrentThread{0};
+		ThreadID							 fCurrentThread{0};
 	};
 
 	/// @brief wakes up thread.
diff --git a/dev/ZKA/KernelKit/PCI/Dma.hxx b/dev/ZKA/KernelKit/PCI/Dma.hxx
index 70292c19..43df13f0 100644
--- a/dev/ZKA/KernelKit/PCI/Dma.hxx
+++ b/dev/ZKA/KernelKit/PCI/Dma.hxx
@@ -52,7 +52,7 @@ namespace Kernel
 		T* Get(const UIntPtr off = 0);
 
 	public:
-		operator bool();
+			 operator bool();
 		bool operator!();
 
 	public:
diff --git a/dev/ZKA/KernelKit/PCI/Iterator.hxx b/dev/ZKA/KernelKit/PCI/Iterator.hxx
index cad8f09f..24c6e610 100644
--- a/dev/ZKA/KernelKit/PCI/Iterator.hxx
+++ b/dev/ZKA/KernelKit/PCI/Iterator.hxx
@@ -13,8 +13,8 @@
 #include <NewKit/Defines.hxx>
 #include <NewKit/Ref.hxx>
 
-#define ZKA_BUS_COUNT		 (256)
-#define ZKA_DEVICE_COUNT	 (33)
+#define ZKA_BUS_COUNT	   (256)
+#define ZKA_DEVICE_COUNT   (33)
 #define ZKA_FUNCTION_COUNT (8)
 
 namespace Kernel::PCI
@@ -28,7 +28,7 @@ namespace Kernel::PCI
 		explicit Iterator(const Types::PciDeviceKind& deviceType);
 
 		Iterator& operator=(const Iterator&) = default;
-		Iterator(const Iterator&) = default;
+		Iterator(const Iterator&)			 = default;
 
 		~Iterator();
 
diff --git a/dev/ZKA/KernelKit/PCI/PCI.hxx b/dev/ZKA/KernelKit/PCI/PCI.hxx
index 8654defa..3289db04 100644
--- a/dev/ZKA/KernelKit/PCI/PCI.hxx
+++ b/dev/ZKA/KernelKit/PCI/PCI.hxx
@@ -9,11 +9,11 @@
 #include <NewKit/Defines.hxx>
 
 #define cPCIConfigAddressPort (0xCF8)
-#define cPCIConfigDataPort	   (0xCFC)
+#define cPCIConfigDataPort	  (0xCFC)
 
 #define cPCIDeviceCount (32)
-#define cPCIFuncCount	 (8)
-#define cPCIBusCount	 (255)
+#define cPCIFuncCount	(8)
+#define cPCIBusCount	(255)
 
 namespace Kernel::PCI
 {
diff --git a/dev/ZKA/KernelKit/PE.hxx b/dev/ZKA/KernelKit/PE.hxx
index bbf9f8d4..4bf3cf9c 100644
--- a/dev/ZKA/KernelKit/PE.hxx
+++ b/dev/ZKA/KernelKit/PE.hxx
@@ -34,7 +34,7 @@ typedef struct LDR_EXEC_HEADER final
 	Kernel::UInt32 mNumberOfSymbols;
 	Kernel::UInt16 mSizeOfOptionalHeader;
 	Kernel::UInt16 mCharacteristics;
-}  LDR_EXEC_HEADER, *LDR_EXEC_HEADER_PTR;
+} LDR_EXEC_HEADER, *LDR_EXEC_HEADER_PTR;
 
 typedef struct LDR_OPTIONAL_HEADER final
 {
@@ -68,21 +68,21 @@ typedef struct LDR_OPTIONAL_HEADER final
 	Kernel::UInt32 mSizeOfHeapCommit;
 	Kernel::UInt32 mLoaderFlags;
 	Kernel::UInt32 mNumberOfRvaAndSizes;
-}  LDR_OPTIONAL_HEADER, *LDR_OPTIONAL_HEADER_PTR;
+} LDR_OPTIONAL_HEADER, *LDR_OPTIONAL_HEADER_PTR;
 
 typedef struct LDR_SECTION_HEADER final
 {
-	Kernel::Char       mName[8];
-	Kernel::UInt32		mVirtualSize;
-	Kernel::UInt32		mVirtualAddress;
-	Kernel::UInt32		mSizeOfRawData;
-	Kernel::UInt32		mPointerToRawData;
-	Kernel::UInt32		mPointerToRelocations;
-	Kernel::UInt32		mPointerToLineNumbers;
-	Kernel::UInt16		mNumberOfRelocations;
-	Kernel::UInt16		mNumberOfLinenumbers;
-	Kernel::UInt32		mCharacteristics;
-}  LDR_SECTION_HEADER, *LDR_SECTION_HEADER_PTR;
+	Kernel::Char   mName[8];
+	Kernel::UInt32 mVirtualSize;
+	Kernel::UInt32 mVirtualAddress;
+	Kernel::UInt32 mSizeOfRawData;
+	Kernel::UInt32 mPointerToRawData;
+	Kernel::UInt32 mPointerToRelocations;
+	Kernel::UInt32 mPointerToLineNumbers;
+	Kernel::UInt16 mNumberOfRelocations;
+	Kernel::UInt16 mNumberOfLinenumbers;
+	Kernel::UInt32 mCharacteristics;
+} LDR_SECTION_HEADER, *LDR_SECTION_HEADER_PTR;
 
 enum kExecDataDirParams
 {
@@ -105,7 +105,7 @@ typedef struct LDR_EXPORT_DIRECTORY
 	Kernel::UInt32 mAddressOfFunctions; // export table rva
 	Kernel::UInt32 mAddressOfNames;
 	Kernel::UInt32 mAddressOfNameOrdinal; // ordinal table rva
-}  LDR_EXPORT_DIRECTORY, *LDR_EXPORT_DIRECTORY_PTR;
+} LDR_EXPORT_DIRECTORY, *LDR_EXPORT_DIRECTORY_PTR;
 
 typedef struct LDR_IMPORT_DIRECTORY
 {
@@ -117,21 +117,23 @@ typedef struct LDR_IMPORT_DIRECTORY
 	Kernel::UInt32 mForwarderChain;
 	Kernel::UInt32 mNameRva;
 	Kernel::UInt32 mThunkTableRva;
-}  LDR_IMPORT_DIRECTORY, *LDR_IMPORT_DIRECTORY_PTR;
+} LDR_IMPORT_DIRECTORY, *LDR_IMPORT_DIRECTORY_PTR;
 
-typedef struct LDR_DATA_DIRECTORY {
-  Kernel::UInt32 VirtualAddress;
-  Kernel::UInt32 Size;
+typedef struct LDR_DATA_DIRECTORY
+{
+	Kernel::UInt32 VirtualAddress;
+	Kernel::UInt32 Size;
 } LDR_DATA_DIRECTORY, *LDR_DATA_DIRECTORY_PTR;
 
-typedef struct LDR_IMAGE_HEADER {
-	LDR_EXEC_HEADER mHeader;
+typedef struct LDR_IMAGE_HEADER
+{
+	LDR_EXEC_HEADER		mHeader;
 	LDR_OPTIONAL_HEADER mOptHdr;
 } LDR_IMAGE_HEADER, *LDR_IMAGE_HEADER_PTR;
 
 enum
 {
-	eUserSection = 0x00000020,
+	eUserSection  = 0x00000020,
 	cPEResourceId = 0xFFaadd00,
 };
 
diff --git a/dev/ZKA/KernelKit/PEF.hxx b/dev/ZKA/KernelKit/PEF.hxx
index ad0de727..e8066cf5 100644
--- a/dev/ZKA/KernelKit/PEF.hxx
+++ b/dev/ZKA/KernelKit/PEF.hxx
@@ -104,11 +104,11 @@ namespace Kernel
 #define kPefDriverExt ".sys"
 
 // Kernel System Binary Interface.
-#define kPefAbi 	   (0x5046)
+#define kPefAbi (0x5046)
 
 #define kPefBaseOrigin (0x40000000)
 
-#define kPefStart 		"__ImageStart"
+#define kPefStart "__ImageStart"
 
 #define kPefForkKind	kPefMagic
 #define kPefForkKindFAT kPefMagicFat
diff --git a/dev/ZKA/KernelKit/ThreadLocalStorage.hxx b/dev/ZKA/KernelKit/ThreadLocalStorage.hxx
index c7803d69..ee272be3 100644
--- a/dev/ZKA/KernelKit/ThreadLocalStorage.hxx
+++ b/dev/ZKA/KernelKit/ThreadLocalStorage.hxx
@@ -24,7 +24,7 @@ struct THREAD_INFORMATION_BLOCK;
 struct PACKED THREAD_INFORMATION_BLOCK final
 {
 	Kernel::Char	f_Cookie[kTLSCookieLen]{0}; //! Thread magic number.
-	Kernel::VoidPtr f_ThreadRecord{nullptr}; //! Thread information record.
+	Kernel::VoidPtr f_ThreadRecord{nullptr};	//! Thread information record.
 };
 
 ///! @brief Cookie Sanity check.
diff --git a/dev/ZKA/KernelKit/User.hxx b/dev/ZKA/KernelKit/User.hxx
index 36353ed0..ce16576b 100644
--- a/dev/ZKA/KernelKit/User.hxx
+++ b/dev/ZKA/KernelKit/User.hxx
@@ -17,7 +17,7 @@
 #define kGuestUser "ZKA USER\\GUEST"
 
 #define kUsersFile "\\Users\\$UsrRcrd"
-#define kUsersDir "\\Users\\"
+#define kUsersDir  "\\Users\\"
 
 #define kMaxUserNameLen	 (255)
 #define kMaxUserTokenLen (255)
@@ -67,9 +67,9 @@ namespace Kernel
 		Bool TrySave(const Char* password) noexcept;
 
 	private:
-		RingKind   fRing{RingKind::kRingStdUser};
-		Char fUserName[kMaxUserNameLen] = { 0 };
-		Char fUserToken[kMaxUserTokenLen] = { 0 };
+		RingKind fRing{RingKind::kRingStdUser};
+		Char	 fUserName[kMaxUserNameLen]	  = {0};
+		Char	 fUserToken[kMaxUserTokenLen] = {0};
 	};
 } // namespace Kernel
 
diff --git a/dev/ZKA/KernelKit/UserProcessScheduler.hxx b/dev/ZKA/KernelKit/UserProcessScheduler.hxx
index b881c3dc..da6a9fc2 100644
--- a/dev/ZKA/KernelKit/UserProcessScheduler.hxx
+++ b/dev/ZKA/KernelKit/UserProcessScheduler.hxx
@@ -12,9 +12,9 @@
 #include <KernelKit/User.hxx>
 #include <NewKit/MutableArray.hxx>
 
-#define kSchedMinMicroTime (AffinityKind::kStandard)
-#define kSchedInvalidPID   (-1)
-#define kSchedMaxStackSz (4096) /* Max stack sz */
+#define kSchedMinMicroTime		  (AffinityKind::kStandard)
+#define kSchedInvalidPID		  (-1)
+#define kSchedMaxStackSz		  (4096) /* Max stack sz */
 #define kSchedProcessLimitPerTeam (16U)
 
 ////////////////////////////////////////////////////
@@ -148,7 +148,7 @@ namespace Kernel
 		HAL::StackFramePtr StackFrame{nullptr};
 		AffinityKind	   Affinity{AffinityKind::kStandard};
 		ProcessStatus	   Status{ProcessStatus::kDead};
-		UInt8* StackReserve{ nullptr };
+		UInt8*			   StackReserve{nullptr};
 
 		// Memory, images pointers.
 		HeapPtrKind HeapCursor{nullptr};
@@ -158,8 +158,8 @@ namespace Kernel
 		SizeT StackSize{mib_cast(8)};
 
 		// shared library handle, reserved for kDLLKind types of executables only.
-		PEFDLLInterface*	  DLLPtr{nullptr};
-		UserProcess* Parent{nullptr};
+		PEFDLLInterface* DLLPtr{nullptr};
+		UserProcess*	 Parent{nullptr};
 
 		// Memory usage.
 		SizeT UsedMemory{0};
@@ -168,7 +168,7 @@ namespace Kernel
 
 		enum
 		{
-			kExeKind		  = 1,
+			kExeKind = 1,
 			kDLLKind = 2,
 			kKindCount,
 		};
@@ -235,14 +235,14 @@ namespace Kernel
 		ZKA_COPY_DEFAULT(UserProcessTeam);
 
 		Array<UserProcess, kSchedProcessLimitPerTeam>& AsArray();
-		Ref<UserProcess>&								AsRef();
-		ProcessID&													Id() noexcept;
+		Ref<UserProcess>&							   AsRef();
+		ProcessID&									   Id() noexcept;
 
 	public:
 		Array<UserProcess, kSchedProcessLimitPerTeam> mProcessList;
-		Ref<UserProcess>							   mCurrentProcess;
-		SizeT												   mProcessAmount{0};
-		ProcessID											   mTeamId{0};
+		Ref<UserProcess>							  mCurrentProcess;
+		SizeT										  mProcessAmount{0};
+		ProcessID									  mTeamId{0};
 	};
 
 	using UserProcessPtr = UserProcess*;
@@ -258,7 +258,7 @@ namespace Kernel
 
 		ZKA_COPY_DEFAULT(UserProcessScheduler)
 
-		operator bool();
+			 operator bool();
 		bool operator!();
 
 	public:
@@ -270,7 +270,7 @@ namespace Kernel
 
 	public:
 		Ref<UserProcess>& CurrentProcess();
-		SizeT					   Run() noexcept;
+		SizeT			  Run() noexcept;
 
 	public:
 		STATIC UserProcessScheduler& The();
@@ -286,8 +286,8 @@ namespace Kernel
 	class ProcessHelper final
 	{
 	public:
-		STATIC bool	 Switch(VoidPtr image_ptr, UInt8* stack_ptr, HAL::StackFramePtr frame_ptr, const PID& new_pid);
-		STATIC bool	 CanBeScheduled(UserProcess& process);
+		STATIC bool Switch(VoidPtr image_ptr, UInt8* stack_ptr, HAL::StackFramePtr frame_ptr, const PID& new_pid);
+		STATIC bool CanBeScheduled(UserProcess& process);
 		STATIC PID&	 TheCurrentPID();
 		STATIC SizeT StartScheduling();
 	};
diff --git a/dev/ZKA/Modules/ACPI/ACPI.hxx b/dev/ZKA/Modules/ACPI/ACPI.hxx
index c959d6c1..00ba4f9e 100644
--- a/dev/ZKA/Modules/ACPI/ACPI.hxx
+++ b/dev/ZKA/Modules/ACPI/ACPI.hxx
@@ -51,22 +51,22 @@ namespace Kernel
 	enum ACPI_ADDRESS_SPACE_KIND : UInt8
 	{
 		eSystemMemory = 0,
-		eSystemIO	 = 1,
-		ePci			 = 2,
-		eController	 = 3,
-		eSmBus		 = 4,
-		eCount		 = 5,
-		eInvalid		 = 0xFF,
+		eSystemIO	  = 1,
+		ePci		  = 2,
+		eController	  = 3,
+		eSmBus		  = 4,
+		eCount		  = 5,
+		eInvalid	  = 0xFF,
 	};
 
 	class PACKED ACPI_ADDRESS final
 	{
 	public:
-		UInt8 AddressSpaceId;
-		UInt8		 RegisterBitWidth;
-		UInt8		 RegisterBitOffset;
-		UInt8		 Reserved;
-		UIntPtr		 Address;
+		UInt8	AddressSpaceId;
+		UInt8	RegisterBitWidth;
+		UInt8	RegisterBitOffset;
+		UInt8	Reserved;
+		UIntPtr Address;
 	};
 
 	class PACKED RSDT final
diff --git a/dev/ZKA/Modules/CoreCG/Accessibility.hxx b/dev/ZKA/Modules/CoreCG/Accessibility.hxx
index b5ce03e9..4a3efbcb 100644
--- a/dev/ZKA/Modules/CoreCG/Accessibility.hxx
+++ b/dev/ZKA/Modules/CoreCG/Accessibility.hxx
@@ -15,13 +15,13 @@
 
 namespace CG
 {
-    using namespace Kernel;
+	using namespace Kernel;
 
 	/// @brief common User interface class.
 	class UIAccessibilty final
 	{
 		explicit UIAccessibilty() = default;
-		~UIAccessibilty() = default;
+		~UIAccessibilty()		  = default;
 
 	public:
 		ZKA_COPY_DELETE(UIAccessibilty);
@@ -42,6 +42,6 @@ namespace CG
 			return kHandoverHeader->f_GOP.f_Height;
 		}
 	};
-} // namespace Kernel
+} // namespace CG
 
 #endif // !__CORECG_ACCESS_HXX__
diff --git a/dev/ZKA/Modules/CoreCG/FbRenderer.hxx b/dev/ZKA/Modules/CoreCG/FbRenderer.hxx
index 08bf9f6a..ca660602 100644
--- a/dev/ZKA/Modules/CoreCG/FbRenderer.hxx
+++ b/dev/ZKA/Modules/CoreCG/FbRenderer.hxx
@@ -102,7 +102,7 @@
 	{                                                                                 \
 		for (Kernel::SizeT y_base = _BaseY; y_base < (_Height + _BaseY); ++y_base)    \
 		{                                                                             \
-			*(((volatile Kernel::UInt32*)(_Rgn +                                 \
+			*(((volatile Kernel::UInt32*)(_Rgn +                                      \
 										  4 * kHandoverHeader->f_GOP.f_PixelPerLine * \
 											  x_base +                                \
 										  4 * y_base))) = _Clr[__GXCursor];           \
@@ -120,12 +120,12 @@
 			*(((volatile Kernel::UInt32*)(_VideoRgn +                                 \
 										  4 * kHandoverHeader->f_GOP.f_PixelPerLine * \
 											  x_base +                                \
-										  4 * y_base))) = _Clr;           \
+										  4 * y_base))) = _Clr;                       \
 			++__GXCursor;                                                             \
 		}                                                                             \
 	}
 
-#define CGDrawInRegionToVideoRgnA(_VideoRgn, _Clr, _Height, _Width, _BaseX, _BaseY)    \
+#define CGDrawInRegionToVideoRgnA(_VideoRgn, _Clr, _Height, _Width, _BaseX, _BaseY)   \
 	__GXCursor = 0;                                                                   \
                                                                                       \
 	for (Kernel::SizeT x_base = _BaseX; x_base < (_Width + _BaseX); ++x_base)         \
@@ -135,7 +135,7 @@
 			*(((volatile Kernel::UInt32*)(_VideoRgn +                                 \
 										  4 * kHandoverHeader->f_GOP.f_PixelPerLine * \
 											  x_base +                                \
-										  4 * y_base))) |= _Clr;           \
+										  4 * y_base))) |= _Clr;                      \
 			++__GXCursor;                                                             \
 		}                                                                             \
 	}
diff --git a/dev/ZKA/Modules/NVME/Defines.hxx b/dev/ZKA/Modules/NVME/Defines.hxx
index 6ab57ccb..3e8b9c98 100644
--- a/dev/ZKA/Modules/NVME/Defines.hxx
+++ b/dev/ZKA/Modules/NVME/Defines.hxx
@@ -55,9 +55,7 @@ namespace Kernel
 	};
 
 	template <Int32 Opcode>
-	inline Bool nvme_create_admin_command(NVMEQueue* entry, UInt32 nsid,
-	UInt32 prpTransfer[3],
-	UInt32 startingLba[2], UInt32 lowTransferBlocks)
+	inline Bool nvme_create_admin_command(NVMEQueue* entry, UInt32 nsid, UInt32 prpTransfer[3], UInt32 startingLba[2], UInt32 lowTransferBlocks)
 	{
 		if (entry == nullptr)
 			return false;
@@ -77,9 +75,7 @@ namespace Kernel
 	}
 
 	template <Int32 Opcode>
-	inline Bool nvme_create_io_command(NVMEQueue* entry, UInt64 baseAddress,
-	UInt32 identLoAndQueueSizeHi, UInt32 flagsLoAndQueueComplIdHi,
-	UInt32 identify, Bool provideIdentify = false, Bool namespaceIdentify = false)
+	inline Bool nvme_create_io_command(NVMEQueue* entry, UInt64 baseAddress, UInt32 identLoAndQueueSizeHi, UInt32 flagsLoAndQueueComplIdHi, UInt32 identify, Bool provideIdentify = false, Bool namespaceIdentify = false)
 	{
 		if (entry == nullptr)
 			return false;
diff --git a/dev/ZKA/NetworkKit/IPC.hxx b/dev/ZKA/NetworkKit/IPC.hxx
index 0d9bc76a..e8597910 100644
--- a/dev/ZKA/NetworkKit/IPC.hxx
+++ b/dev/ZKA/NetworkKit/IPC.hxx
@@ -58,7 +58,7 @@ namespace Kernel
 	{
 		eIPCEPLittleEndian = 0,
 		eIPCEPBigEndian	   = 1,
-		eIPCEPMixedEndian = 2,
+		eIPCEPMixedEndian  = 2,
 	};
 
 	constexpr auto cXPCOMMsgSize = 6094U;
diff --git a/dev/ZKA/NewKit/Defines.hxx b/dev/ZKA/NewKit/Defines.hxx
index c83ec782..0be72aaf 100644
--- a/dev/ZKA/NewKit/Defines.hxx
+++ b/dev/ZKA/NewKit/Defines.hxx
@@ -8,7 +8,7 @@
 
 #include <NewKit/Macros.hxx>
 
-#define NEWKIT_VERSION "1.01"
+#define NEWKIT_VERSION	  "1.01"
 #define NEWKIT_VERSION_CB 0x0101
 
 #if !defined(_INC_NO_STDC_HEADERS) && defined(__GNUC__)
diff --git a/dev/ZKA/NewKit/Json.hxx b/dev/ZKA/NewKit/Json.hxx
index 723a9497..e37dc93d 100644
--- a/dev/ZKA/NewKit/Json.hxx
+++ b/dev/ZKA/NewKit/Json.hxx
@@ -15,9 +15,9 @@
 #include <NewKit/String.hxx>
 #include <NewKit/Utils.hxx>
 
-#define cMaxJsonPath  4096
-#define cJSONLen 32
-#define cJSONNull "null"
+#define cMaxJsonPath 4096
+#define cJSONLen	 32
+#define cJSONNull	 "null"
 
 namespace Kernel
 {
@@ -27,11 +27,11 @@ namespace Kernel
 	public:
 		explicit JsonType()
 		{
-		    auto len = cJSONLen;
+			auto	   len = cJSONLen;
 			StringView key = StringView(len);
 			key += cJSONNull;
 
-			this->AsKey() = key;
+			this->AsKey()	= key;
 			this->AsValue() = key;
 		}
 
@@ -44,10 +44,13 @@ namespace Kernel
 
 		ZKA_COPY_DEFAULT(JsonType);
 
-		const Bool& IsUndefined() { return fUndefined; }
+		const Bool& IsUndefined()
+		{
+			return fUndefined;
+		}
 
 	private:
-	    Bool fUndefined; // is this instance undefined?
+		Bool	   fUndefined; // is this instance undefined?
 		StringView fKey;
 		StringView fValue;
 
diff --git a/dev/ZKA/NewKit/Macros.hxx b/dev/ZKA/NewKit/Macros.hxx
index 8c66995b..4b1f4268 100644
--- a/dev/ZKA/NewKit/Macros.hxx
+++ b/dev/ZKA/NewKit/Macros.hxx
@@ -11,7 +11,7 @@
 #endif
 
 #ifndef kib_cast
-#define kib_cast(X) ((X) * 1024)
+#define kib_cast(X) ((X)*1024)
 #endif
 
 #ifndef MIB
@@ -94,10 +94,10 @@
 #define CANT_REACH() __builtin_unreachable()
 #endif
 
-#define kBadPtr	 0xFBFBFBFBFBFBFBFB
+#define kBadPtr		0xFBFBFBFBFBFBFBFB
 #define kBadAddress 0x00000000000000
-#define kMaxAddr 0xFFFFFFFFFFFFFFFF
-#define kPathLen 255
+#define kMaxAddr	0xFFFFFFFFFFFFFFFF
+#define kPathLen	255
 
 #define PACKED	ATTRIBUTE(packed)
 #define NO_EXEC ATTRIBUTE(noexec)
@@ -107,7 +107,7 @@
 
 #define CONST const
 
-#define STRINGIFY(X)	#X
+#define STRINGIFY(X)  #X
 #define ZKA_UNUSED(X) ((Kernel::Void)X)
 
 #ifndef RGB
diff --git a/dev/ZKA/NewKit/Ref.hxx b/dev/ZKA/NewKit/Ref.hxx
index 41f003be..977c353a 100644
--- a/dev/ZKA/NewKit/Ref.hxx
+++ b/dev/ZKA/NewKit/Ref.hxx
@@ -39,7 +39,7 @@ namespace Kernel
 	public:
 		T operator->() const
 		{
-		    MUST_PASS(*fClass);
+			MUST_PASS(*fClass);
 			return *fClass;
 		}
 
@@ -50,7 +50,7 @@ namespace Kernel
 
 		T& TryLeak() const noexcept
 		{
-		    MUST_PASS(*fClass);
+			MUST_PASS(*fClass);
 			return *fClass;
 		}
 
@@ -70,7 +70,7 @@ namespace Kernel
 		}
 
 	private:
-	    T*	 fClass{nullptr};
+		T*	 fClass{nullptr};
 		Bool fStrong{false};
 	};
 
diff --git a/dev/ZKA/NewKit/String.hxx b/dev/ZKA/NewKit/String.hxx
index 8c4986ec..1849bc77 100644
--- a/dev/ZKA/NewKit/String.hxx
+++ b/dev/ZKA/NewKit/String.hxx
@@ -18,7 +18,7 @@ namespace Kernel
 	public:
 		explicit StringView()
 		{
-		    fSz = 4096;
+			fSz = 4096;
 
 			fData = new Char[fSz];
 			MUST_PASS(fData);
diff --git a/dev/ZKA/NewKit/Variant.hxx b/dev/ZKA/NewKit/Variant.hxx
index b60d2824..015cec92 100644
--- a/dev/ZKA/NewKit/Variant.hxx
+++ b/dev/ZKA/NewKit/Variant.hxx
@@ -55,7 +55,7 @@ namespace Kernel
 
 	public:
 		const Char* ToString();
-		VoidPtr Leak();
+		VoidPtr		Leak();
 
 	private:
 		voidPtr		fPtr{nullptr};
diff --git a/dev/ZKA/Sources/CodeManager.cxx b/dev/ZKA/Sources/CodeManager.cxx
index de5417a1..5f634539 100644
--- a/dev/ZKA/Sources/CodeManager.cxx
+++ b/dev/ZKA/Sources/CodeManager.cxx
@@ -22,7 +22,7 @@ namespace Kernel
 		UserProcess proc;
 		proc.SetEntrypoint(reinterpret_cast<VoidPtr>(main));
 
-		proc.Kind = UserProcess::kExeKind;
+		proc.Kind	   = UserProcess::kExeKind;
 		proc.StackSize = mib_cast(1);
 
 		rt_copy_memory((VoidPtr)processName, proc.Name, rt_string_len(processName));
diff --git a/dev/ZKA/Sources/GUIDWizard.cxx b/dev/ZKA/Sources/GUIDWizard.cxx
index bdd274a4..aede3a19 100644
--- a/dev/ZKA/Sources/GUIDWizard.cxx
+++ b/dev/ZKA/Sources/GUIDWizard.cxx
@@ -26,9 +26,9 @@ namespace Kernel::XRN::Version1
 
 		Ref<GUIDSequence*> sequenceReference{seq, true};
 
-		sequenceReference->fMs1 = uuidSeq[0];
-		sequenceReference->fMs2 = uuidSeq[1];
-		sequenceReference->fMs3 = uuidSeq[2];
+		sequenceReference->fMs1	   = uuidSeq[0];
+		sequenceReference->fMs2	   = uuidSeq[1];
+		sequenceReference->fMs3	   = uuidSeq[2];
 		sequenceReference->fMs4[0] = uuidSeq[3];
 		sequenceReference->fMs4[1] = uuidSeq[4];
 		sequenceReference->fMs4[2] = uuidSeq[5];
diff --git a/dev/ZKA/Sources/Heap.cxx b/dev/ZKA/Sources/Heap.cxx
index 0146bd55..0ae6a965 100644
--- a/dev/ZKA/Sources/Heap.cxx
+++ b/dev/ZKA/Sources/Heap.cxx
@@ -18,9 +18,9 @@
 
 namespace Kernel
 {
-	SizeT	   kHeapCount = 0UL;
+	SizeT		kHeapCount = 0UL;
 	PageManager kHeapPageManager;
-	Bool kOperationInProgress = No;
+	Bool		kOperationInProgress = No;
 
 	/// @brief Contains data structures and algorithms for the heap.
 	namespace Detail
@@ -106,12 +106,12 @@ namespace Kernel
 				wrapper.VirtualAddress());
 
 		heap_info_ptr->fTargetPtrSize = szFix;
-		heap_info_ptr->fMagic		 = kKernelHeapMagic;
-		heap_info_ptr->fCRC32		 = 0U; // dont fill it for now.
-		heap_info_ptr->fTargetPtr	 = wrapper.VirtualAddress() + sizeof(Detail::HEAP_INFORMATION_BLOCK);
-		heap_info_ptr->fPagePtr		 = 0UL;
-		heap_info_ptr->fUserOwned = user;
-		heap_info_ptr->fPresent = true;
+		heap_info_ptr->fMagic		  = kKernelHeapMagic;
+		heap_info_ptr->fCRC32		  = 0U; // dont fill it for now.
+		heap_info_ptr->fTargetPtr	  = wrapper.VirtualAddress() + sizeof(Detail::HEAP_INFORMATION_BLOCK);
+		heap_info_ptr->fPagePtr		  = 0UL;
+		heap_info_ptr->fUserOwned	  = user;
+		heap_info_ptr->fPresent		  = true;
 
 		++kHeapCount;
 
diff --git a/dev/ZKA/Sources/Network/IPC.cxx b/dev/ZKA/Sources/Network/IPC.cxx
index 97702cbe..42b0fcb9 100644
--- a/dev/ZKA/Sources/Network/IPC.cxx
+++ b/dev/ZKA/Sources/Network/IPC.cxx
@@ -96,15 +96,15 @@ namespace Kernel
 
 			(*pckt_in)->IpcHeaderMagic = cXPCOMHeaderMagic;
 
-			(*pckt_in)->IpcEndianess		= static_cast<UInt8>(endian);
-			(*pckt_in)->IpcPacketSize		= sizeof(IPC_MESSAGE_STRUCT);
-			
-			(*pckt_in)->IpcTo.UserProcessID	= 0;
+			(*pckt_in)->IpcEndianess  = static_cast<UInt8>(endian);
+			(*pckt_in)->IpcPacketSize = sizeof(IPC_MESSAGE_STRUCT);
+
+			(*pckt_in)->IpcTo.UserProcessID	  = 0;
 			(*pckt_in)->IpcTo.UserProcessTeam = 0;
 
 			(*pckt_in)->IpcFrom.UserProcessID	= Kernel::UserProcessScheduler::The().CurrentProcess().Leak().ProcessId;
 			(*pckt_in)->IpcFrom.UserProcessTeam = Kernel::UserProcessScheduler::The().CurrentTeam().mTeamId;
-			
+
 			return true;
 		}
 
diff --git a/dev/ZKA/Sources/String.cxx b/dev/ZKA/Sources/String.cxx
index 2681dddd..bfa80711 100644
--- a/dev/ZKA/Sources/String.cxx
+++ b/dev/ZKA/Sources/String.cxx
@@ -228,7 +228,7 @@ namespace Kernel
 	STATIC void rt_string_append(Char* lhs, const Char* rhs, Int32 cur)
 	{
 		SizeT sz_rhs = rt_string_len(rhs);
-		SizeT rhs_i = 0;
+		SizeT rhs_i	 = 0;
 
 		for (; rhs_i < sz_rhs; ++rhs_i)
 		{
diff --git a/dev/ZKA/Sources/Timer.cxx b/dev/ZKA/Sources/Timer.cxx
index 3e5f6f3d..397c19a9 100644
--- a/dev/ZKA/Sources/Timer.cxx
+++ b/dev/ZKA/Sources/Timer.cxx
@@ -23,14 +23,13 @@ Int32 TimerInterface::Wait() noexcept
 SoftwareTimer::SoftwareTimer(Int64 seconds)
 	: fWaitFor(seconds)
 {
-    fDigitalTimer = new IntPtr();
-    MUST_PASS(fDigitalTimer);
-
+	fDigitalTimer = new IntPtr();
+	MUST_PASS(fDigitalTimer);
 }
 
 SoftwareTimer::~SoftwareTimer()
 {
-    delete fDigitalTimer;
+	delete fDigitalTimer;
 	fWaitFor = 0;
 }
 
diff --git a/dev/ZKA/Sources/URL.cxx b/dev/ZKA/Sources/URL.cxx
index 9c76d435..e10310f5 100644
--- a/dev/ZKA/Sources/URL.cxx
+++ b/dev/ZKA/Sources/URL.cxx
@@ -21,10 +21,10 @@ namespace Kernel
 
 	/// @brief internal and reserved protocols by Kernel.
 	constexpr const Char* kURLProtocols[] = {
-		"file", // Filesystem protocol
-		"zup",	// ZKA update protocol
-		"oscc", // Open System Configuration Connectivity.
-		"odbc", // ODBC connectivity.
+		"file",	 // Filesystem protocol
+		"zup",	 // ZKA update protocol
+		"oscc",	 // Open System Configuration Connectivity.
+		"odbc",	 // ODBC connectivity.
 		"https", // HTTPS layer driver (HTTPS.sys).
 	};
 
diff --git a/dev/ZKA/Sources/Variant.cxx b/dev/ZKA/Sources/Variant.cxx
index 97775900..e988d783 100644
--- a/dev/ZKA/Sources/Variant.cxx
+++ b/dev/ZKA/Sources/Variant.cxx
@@ -24,5 +24,8 @@ namespace Kernel
 	}
 
 	/// @brief Leak variant's instance.
-	VoidPtr Variant::Leak() { return fPtr; }
+	VoidPtr Variant::Leak()
+	{
+		return fPtr;
+	}
 } // namespace Kernel
diff --git a/dev/ZKA/StorageKit/ATA.hxx b/dev/ZKA/StorageKit/ATA.hxx
index da2988e5..be3e4a21 100644
--- a/dev/ZKA/StorageKit/ATA.hxx
+++ b/dev/ZKA/StorageKit/ATA.hxx
@@ -34,6 +34,6 @@ namespace Kernel
 		const Char* Name() const override;
 
 	private:
-		void (*fCleanup)(void) = { nullptr };
+		void (*fCleanup)(void) = {nullptr};
 	};
 } // namespace Kernel
diff --git a/tools/drvsign.cxx b/tools/drvsign.cxx
index 28001208..ad3eee67 100644
--- a/tools/drvsign.cxx
+++ b/tools/drvsign.cxx
@@ -56,8 +56,8 @@ int main(int argc, char* argv[])
 	}
 
 	if (!std::filesystem::exists(argv[1]) ||
-			!std::string(argv[1]).ends_with(kDriverExt))
-			return -1;
+		!std::string(argv[1]).ends_with(kDriverExt))
+		return -1;
 
 	details::SIGNED_DRIVER_HEADER sig{0};