diff --git a/reactos/win32ss/user/ntuser/desktop.c b/reactos/win32ss/user/ntuser/desktop.c
index 857da893f0d..4e253e8530b 100644
--- a/reactos/win32ss/user/ntuser/desktop.c
+++ b/reactos/win32ss/user/ntuser/desktop.c
@@ -726,7 +726,7 @@ VOID NTAPI DesktopThreadMain()
        classes will be allocated from the shared heap */
     UserRegisterSystemClasses();
 
-    while(TRUE)
+    while (TRUE)
     {
         Ret = co_IntGetPeekMessage(&Msg, 0, 0, 0, PM_REMOVE, TRUE);
         if (Ret)
@@ -1892,9 +1892,9 @@ IntMapDesktopView(IN PDESKTOP pdesk)
     TRACE("IntMapDesktopView called for desktop object 0x%p\n", pdesk);
 
     ppi = PsGetCurrentProcessWin32Process();
-    PrevLink = &ppi->HeapMappings.Next;
 
     /* Find out if another thread already mapped the desktop heap */
+    PrevLink    = &ppi->HeapMappings.Next;
     HeapMapping = *PrevLink;
     while (HeapMapping != NULL)
     {
@@ -1904,7 +1904,7 @@ IntMapDesktopView(IN PDESKTOP pdesk)
             return STATUS_SUCCESS;
         }
 
-        PrevLink = &HeapMapping->Next;
+        PrevLink    = &HeapMapping->Next;
         HeapMapping = HeapMapping->Next;
     }
 
diff --git a/reactos/win32ss/user/ntuser/input.c b/reactos/win32ss/user/ntuser/input.c
index 691872fbe79..9bed4a7ac59 100644
--- a/reactos/win32ss/user/ntuser/input.c
+++ b/reactos/win32ss/user/ntuser/input.c
@@ -153,7 +153,7 @@ RawInputThreadMain()
     StartTheTimers();
     UserLeave();
 
-    for(;;)
+    for (;;)
     {
         if (!ghMouseDevice)
         {
@@ -300,7 +300,7 @@ RawInputThreadMain()
  * CreateSystemThreads
  *
  * Called form dedicated thread in CSRSS. RIT is started in context of this
- * thread because it needs valid Win32 process with TEB initialized
+ * thread because it needs valid Win32 process with TEB initialized.
  */
 DWORD NTAPI
 CreateSystemThreads(UINT Type)
diff --git a/reactos/win32ss/user/ntuser/main.c b/reactos/win32ss/user/ntuser/main.c
index cd47ad1eb17..29f48c87969 100644
--- a/reactos/win32ss/user/ntuser/main.c
+++ b/reactos/win32ss/user/ntuser/main.c
@@ -53,7 +53,7 @@ DbgPostServiceHook(ULONG ulSyscallId, ULONG_PTR ulResult)
 
 static
 NTSTATUS
-CreateProcessInfo(PEPROCESS Process)
+UserCreateProcessInfo(PEPROCESS Process)
 {
     PPROCESSINFO ppiCurrent;
     NTSTATUS Status;
@@ -94,7 +94,7 @@ CreateProcessInfo(PEPROCESS Process)
 
     TRACE_CH(UserProcess,"Allocated ppi 0x%p for PID:0x%lx\n", ppiCurrent, HandleToUlong(Process->UniqueProcessId));
 
-    /* map the global heap into the process */
+    /* Map the global heap into the process */
     Offset.QuadPart = 0;
     Status = MmMapViewOfSection(GlobalUserHeapSection,
                                 PsGetCurrentProcess(),
@@ -133,14 +133,13 @@ CreateProcessInfo(PEPROCESS Process)
 
     KeInitializeEvent(ppiCurrent->InputIdleEvent, NotificationEvent, FALSE);
 
-
-    /* map the gdi handle table to user land */
+    /* Map the gdi handle table to user land */
     Process->Peb->GdiSharedHandleTable = GDI_MapHandleTable(Process);
     Process->Peb->GdiDCAttributeList = GDI_BATCH_LIMIT;
     pParams = Process->Peb->ProcessParameters;
 
     ppiCurrent->peProcess = Process;
-    /* setup process flags */
+    /* Setup process flags */
     ppiCurrent->W32PF_flags = W32PF_THREADCONNECTED;
 
     if ( pParams &&
@@ -150,7 +149,7 @@ CreateProcessInfo(PEPROCESS Process)
        ppiCurrent->W32PF_flags |= W32PF_SCREENSAVER;
     }
 
-    // Fixme check if this process is allowed.
+    // FIXME: check if this process is allowed.
     ppiCurrent->W32PF_flags |= W32PF_ALLOWFOREGROUNDACTIVATE; // Starting application it will get toggled off.
 
     /* Create pools for GDI object attributes */
@@ -171,7 +170,7 @@ CreateProcessInfo(PEPROCESS Process)
 
 static
 NTSTATUS
-DestroyProcessInfo(PEPROCESS Process)
+UserDestroyProcessInfo(PEPROCESS Process)
 {
     PPROCESSINFO ppiCurrent, *pppi;
 
@@ -288,11 +287,11 @@ Win32kProcessCallback(struct _EPROCESS *Process,
 
     if (Create)
     {
-        Status = CreateProcessInfo(Process);
+        Status = UserCreateProcessInfo(Process);
     }
     else
     {
-        Status = DestroyProcessInfo(Process);
+        Status = UserDestroyProcessInfo(Process);
     }
 
     UserLeave();