2 files changed, 24 insertions, 48 deletions

diff --git a/src/kernel/KernelKit/CoreProcessScheduler.h b/src/kernel/KernelKit/CoreProcessScheduler.h
index 5071f85d..e3cfc12c 100644
--- a/src/kernel/KernelKit/CoreProcessScheduler.h
+++ b/src/kernel/KernelKit/CoreProcessScheduler.h
@@ -60,19 +60,11 @@ struct ProcessHeapTree {
 
   TreeKind Color{TreeKind::kBlackTreeKind};
 
-  struct ProcessHeapTree<T>* Parent {
-    nullptr
-  };
-  struct ProcessHeapTree<T>* Child {
-    nullptr
-  };
-
-  struct ProcessHeapTree<T>* Prev {
-    nullptr
-  };
-  struct ProcessHeapTree<T>* Next {
-    nullptr
-  };
+  struct ProcessHeapTree<T>* Parent{nullptr};
+  struct ProcessHeapTree<T>* Child{nullptr};
+
+  struct ProcessHeapTree<T>* Prev{nullptr};
+  struct ProcessHeapTree<T>* Next{nullptr};
 };
 
 template <typename T>
@@ -87,21 +79,13 @@ struct ProcessFileTree {
 
   TreeKind Color{TreeKind::kBlackTreeKind};
 
-  struct ProcessFileTree<T>* Parent {
-    nullptr
-  };
+  struct ProcessFileTree<T>* Parent{nullptr};
 
-  struct ProcessFileTree<T>* Child {
-    nullptr
-  };
+  struct ProcessFileTree<T>* Child{nullptr};
 
-  struct ProcessFileTree<T>* Prev {
-    nullptr
-  };
+  struct ProcessFileTree<T>* Prev{nullptr};
 
-  struct ProcessFileTree<T>* Next {
-    nullptr
-  };
+  struct ProcessFileTree<T>* Next{nullptr};
 };
 
 using ProcessCtx = UInt32;
@@ -121,21 +105,13 @@ struct ProcessSpecialTree {
 
   TreeKind Color{TreeKind::kBlackTreeKind};
 
-  struct ProcessSpecialTree<T>* Parent {
-    nullptr
-  };
+  struct ProcessSpecialTree<T>* Parent{nullptr};
 
-  struct ProcessSpecialTree<T>* Child {
-    nullptr
-  };
+  struct ProcessSpecialTree<T>* Child{nullptr};
 
-  struct ProcessSpecialTree<T>* Prev {
-    nullptr
-  };
+  struct ProcessSpecialTree<T>* Prev{nullptr};
 
-  struct ProcessSpecialTree<T>* Next {
-    nullptr
-  };
+  struct ProcessSpecialTree<T>* Next{nullptr};
 };
 
 /***********************************************************************************/
diff --git a/src/kernel/KernelKit/UserProcessScheduler.h b/src/kernel/KernelKit/UserProcessScheduler.h
index 9d483ef4..859dd9e5 100644
--- a/src/kernel/KernelKit/UserProcessScheduler.h
+++ b/src/kernel/KernelKit/UserProcessScheduler.h
@@ -63,10 +63,10 @@ class UserProcess final NE_VETTABLE {
     UIntPtr           SignalID{0};
   };
 
-  USER_PROCESS_SIGNAL         Signal;
+  USER_PROCESS_SIGNAL       Signal;
   ProcessFileTree<VoidPtr>* FileTree{nullptr};
   ProcessHeapTree<VoidPtr>* HeapTree{nullptr};
-  UserProcessTeam*            ParentTeam;
+  UserProcessTeam*          ParentTeam;
 
   VoidPtr VMRegister{0UL};
 
@@ -158,8 +158,8 @@ class UserProcess final NE_VETTABLE {
   friend UserProcessHelper;
 };
 
-typedef Array<UserProcess, kSchedProcessLimitPerTeam> USER_PROCESS_ARRAY;
-typedef Ref<UserProcess>                              USER_PROCESS_REF;
+typedef Array<UserProcess, kSchedProcessLimitPerTeam> UserProcessArray;
+typedef Ref<UserProcess>                              UserProcessRef;
 
 /// \brief Processs Team (contains multiple processes inside it.)
 /// Equivalent to a process batch
@@ -172,13 +172,13 @@ class UserProcessTeam final {
 
   Array<UserProcess, kSchedProcessLimitPerTeam>& AsArray();
   Ref<UserProcess>&                              AsRef();
-  ProcessID&                                      Id();
+  ProcessID&                                     Id();
 
  public:
-  USER_PROCESS_ARRAY mProcessList;
-  USER_PROCESS_REF   mCurrentProcess;
-  ProcessID          mTeamId{0};
-  ProcessID          mProcessCur{0};
+  UserProcessArray mProcessList;
+  UserProcessRef   mCurrentProcess;
+  ProcessID        mTeamId{0};
+  ProcessID        mProcessCur{0};
 };
 
 /***********************************************************************************/
@@ -212,8 +212,8 @@ class UserProcessScheduler final : public ISchedulable {
   Bool HasMP() override;
 
  public:
-  USER_PROCESS_REF& TheCurrentProcess();
-  SizeT             Run();
+  UserProcessRef& TheCurrentProcess();
+  SizeT           Run();
 
  public:
   STATIC UserProcessScheduler& The();