diff --git a/reactos/dll/cpl/access/access.c b/reactos/dll/cpl/access/access.c
index 891405e28ca..64ad721c7a4 100644
--- a/reactos/dll/cpl/access/access.c
+++ b/reactos/dll/cpl/access/access.c
@@ -20,28 +20,23 @@
 #define NUM_APPLETS	(1)
 
 LONG CALLBACK SystemApplet(VOID);
-INT_PTR CALLBACK DisplayPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
-INT_PTR CALLBACK GeneralPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
-INT_PTR CALLBACK KeyboardPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
-INT_PTR CALLBACK MousePageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
-INT_PTR CALLBACK SoundPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
 HINSTANCE hApplet = 0;
 
 /* Applets */
-APPLET Applets[NUM_APPLETS] = 
+APPLET Applets[NUM_APPLETS] =
 {
-  {IDI_CPLACCESS, IDS_CPLSYSTEMNAME, IDS_CPLSYSTEMDESCRIPTION, SystemApplet}
+    {IDI_CPLACCESS, IDS_CPLSYSTEMNAME, IDS_CPLSYSTEMDESCRIPTION, SystemApplet}
 };
 
-static void
+static VOID
 InitPropSheetPage(PROPSHEETPAGE *psp, WORD idDlg, DLGPROC DlgProc)
 {
-  ZeroMemory(psp, sizeof(PROPSHEETPAGE));
-  psp->dwSize = sizeof(PROPSHEETPAGE);
-  psp->dwFlags = PSP_DEFAULT;
-  psp->hInstance = hApplet;
-  psp->pszTemplate = MAKEINTRESOURCE(idDlg);
-  psp->pfnDlgProc = DlgProc;
+    ZeroMemory(psp, sizeof(PROPSHEETPAGE));
+    psp->dwSize = sizeof(PROPSHEETPAGE);
+    psp->dwFlags = PSP_DEFAULT;
+    psp->hInstance = hApplet;
+    psp->pszTemplate = MAKEINTRESOURCE(idDlg);
+    psp->pfnDlgProc = DlgProc;
 }
 
 
@@ -50,86 +45,85 @@ InitPropSheetPage(PROPSHEETPAGE *psp, WORD idDlg, DLGPROC DlgProc)
 LONG CALLBACK
 SystemApplet(VOID)
 {
-  PROPSHEETPAGE psp[5];
-  PROPSHEETHEADER psh;
-  TCHAR Caption[1024];
-  
-  LoadString(hApplet, IDS_CPLSYSTEMNAME, Caption, sizeof(Caption) / sizeof(TCHAR));
-  
-  ZeroMemory(&psh, sizeof(PROPSHEETHEADER));
-  psh.dwSize = sizeof(PROPSHEETHEADER);
-  psh.dwFlags =  PSH_PROPSHEETPAGE;
-  psh.hwndParent = NULL;
-  psh.hInstance = hApplet;
-  psh.hIcon = LoadIcon(hApplet, MAKEINTRESOURCE(IDI_CPLACCESS));
-  psh.pszCaption = Caption;
-  psh.nPages = sizeof(psp) / sizeof(PROPSHEETPAGE);
-  psh.nStartPage = 0;
-  psh.ppsp = psp;
-  
-  InitPropSheetPage(&psp[0], IDD_PROPPAGEKEYBOARD, (DLGPROC) KeyboardPageProc);
-  InitPropSheetPage(&psp[1], IDD_PROPPAGESOUND, (DLGPROC) SoundPageProc);
-  InitPropSheetPage(&psp[2], IDD_PROPPAGEDISPLAY, (DLGPROC) DisplayPageProc);
-  InitPropSheetPage(&psp[3], IDD_PROPPAGEMOUSE, (DLGPROC) MousePageProc);
-  InitPropSheetPage(&psp[4], IDD_PROPPAGEGENERAL, (DLGPROC) GeneralPageProc);
-  
-  return (LONG)(PropertySheet(&psh) != -1);
+    PROPSHEETPAGE psp[5];
+    PROPSHEETHEADER psh;
+    TCHAR Caption[1024];
+
+    LoadString(hApplet, IDS_CPLSYSTEMNAME, Caption, sizeof(Caption) / sizeof(TCHAR));
+
+    ZeroMemory(&psh, sizeof(PROPSHEETHEADER));
+    psh.dwSize = sizeof(PROPSHEETHEADER);
+    psh.dwFlags =  PSH_PROPSHEETPAGE;
+    psh.hwndParent = NULL;
+    psh.hInstance = hApplet;
+    psh.hIcon = LoadIcon(hApplet, MAKEINTRESOURCE(IDI_CPLACCESS));
+    psh.pszCaption = Caption;
+    psh.nPages = sizeof(psp) / sizeof(PROPSHEETPAGE);
+    psh.nStartPage = 0;
+    psh.ppsp = psp;
+
+    InitPropSheetPage(&psp[0], IDD_PROPPAGEKEYBOARD, (DLGPROC)KeyboardPageProc);
+    InitPropSheetPage(&psp[1], IDD_PROPPAGESOUND, (DLGPROC)SoundPageProc);
+    InitPropSheetPage(&psp[2], IDD_PROPPAGEDISPLAY, (DLGPROC)DisplayPageProc);
+    InitPropSheetPage(&psp[3], IDD_PROPPAGEMOUSE, (DLGPROC)MousePageProc);
+    InitPropSheetPage(&psp[4], IDD_PROPPAGEGENERAL, (DLGPROC)GeneralPageProc);
+
+    return (LONG)(PropertySheet(&psh) != -1);
 }
 
 /* Control Panel Callback */
 LONG CALLBACK
-CPlApplet(
-	HWND hwndCPl,
-	UINT uMsg,
-	LPARAM lParam1,
-	LPARAM lParam2)
+CPlApplet(HWND hwndCPl,
+          UINT uMsg,
+          LPARAM lParam1,
+          LPARAM lParam2)
 {
-  int i = (int)lParam1;
-  UNREFERENCED_PARAMETER(hwndCPl);
+    INT i = (INT)lParam1;
 
-  switch(uMsg)
-  {
-    case CPL_INIT:
+    UNREFERENCED_PARAMETER(hwndCPl);
+
+    switch (uMsg)
     {
-      return TRUE;
+        case CPL_INIT:
+            return TRUE;
+
+        case CPL_GETCOUNT:
+            return NUM_APPLETS;
+
+        case CPL_INQUIRE:
+            {
+                CPLINFO *CPlInfo = (CPLINFO*)lParam2;
+                CPlInfo->lData = 0;
+                CPlInfo->idIcon = Applets[i].idIcon;
+                CPlInfo->idName = Applets[i].idName;
+                CPlInfo->idInfo = Applets[i].idDescription;
+            }
+            break;
+
+        case CPL_DBLCLK:
+            Applets[i].AppletProc();
+            break;
     }
-    case CPL_GETCOUNT:
-    {
-      return NUM_APPLETS;
-    }
-    case CPL_INQUIRE:
-    {
-      CPLINFO *CPlInfo = (CPLINFO*)lParam2;
-      CPlInfo->lData = 0;
-      CPlInfo->idIcon = Applets[i].idIcon;
-      CPlInfo->idName = Applets[i].idName;
-      CPlInfo->idInfo = Applets[i].idDescription;
-      break;
-    }
-    case CPL_DBLCLK:
-    {
-      Applets[i].AppletProc();
-      break;
-    }
-  }
-  return FALSE;
+
+    return FALSE;
 }
 
 
 BOOL STDCALL
-DllMain(
-	HINSTANCE hinstDLL,
-	DWORD     dwReason,
-	LPVOID    lpvReserved)
+DllMain(HINSTANCE hinstDLL,
+        DWORD dwReason,
+        LPVOID lpvReserved)
 {
-  UNREFERENCED_PARAMETER(lpvReserved);
-  switch(dwReason)
-  {
-    case DLL_PROCESS_ATTACH:
-    case DLL_THREAD_ATTACH:
-      hApplet = hinstDLL;
-      break;
-  }
+    UNREFERENCED_PARAMETER(lpvReserved);
+
+    switch (dwReason)
+    {
+        case DLL_PROCESS_ATTACH:
+        case DLL_THREAD_ATTACH:
+            hApplet = hinstDLL;
+            break;
+    }
+
   return TRUE;
 }
 
diff --git a/reactos/dll/cpl/access/access.h b/reactos/dll/cpl/access/access.h
index 337bc5b692c..fe4ec719162 100644
--- a/reactos/dll/cpl/access/access.h
+++ b/reactos/dll/cpl/access/access.h
@@ -3,18 +3,24 @@
 
 typedef LONG (CALLBACK *APPLET_INITPROC)(VOID);
 
-typedef struct
+typedef struct _APPLET
 {
-  int idIcon;
-  int idName;
-  int idDescription;
-  APPLET_INITPROC AppletProc;
+    INT idIcon;
+    INT idName;
+    INT idDescription;
+    APPLET_INITPROC AppletProc;
 } APPLET, *PAPPLET;
 
 extern HINSTANCE hApplet;
 
 void ShowLastWin32Error(HWND hWndOwner);
 
+INT_PTR CALLBACK DisplayPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
+INT_PTR CALLBACK GeneralPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
+INT_PTR CALLBACK KeyboardPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
+INT_PTR CALLBACK MousePageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
+INT_PTR CALLBACK SoundPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
+
 #endif /* __CPL_SYSDM_H */
 
 /* EOF */
diff --git a/reactos/dll/cpl/access/display.c b/reactos/dll/cpl/access/display.c
index 99cd40914aa..466e43aa3e3 100644
--- a/reactos/dll/cpl/access/display.c
+++ b/reactos/dll/cpl/access/display.c
@@ -15,35 +15,33 @@
 
 /* Property page dialog callback */
 INT_PTR CALLBACK
-DisplayPageProc(
-  HWND hwndDlg,
-  UINT uMsg,
-  WPARAM wParam,
-  LPARAM lParam
-)
+DisplayPageProc(HWND hwndDlg,
+                UINT uMsg,
+                WPARAM wParam,
+                LPARAM lParam)
 {
-  UNREFERENCED_PARAMETER(lParam);
-  UNREFERENCED_PARAMETER(hwndDlg);
-  switch(uMsg)
-  {
-    case WM_INITDIALOG:
-      break;
-    case WM_COMMAND:
+    UNREFERENCED_PARAMETER(lParam);
+    UNREFERENCED_PARAMETER(hwndDlg);
+
+    switch (uMsg)
     {
-      switch(LOWORD(wParam))
-      {
-        case IDC_CONTRAST_BOX:
-        {
-          break;
-        }
-        case IDC_CONTRAST_BUTTON:
-        {
-          break;
-        }
-        default:
-          break;
-      }
+        case WM_INITDIALOG:
+            break;
+
+        case WM_COMMAND:
+            switch (LOWORD(wParam))
+            {
+                case IDC_CONTRAST_BOX:
+                    break;
+
+                case IDC_CONTRAST_BUTTON:
+                    break;
+
+                default:
+                    break;
+            }
+            break;
     }
-  }
-  return FALSE;
+
+    return FALSE;
 }
diff --git a/reactos/dll/cpl/access/general.c b/reactos/dll/cpl/access/general.c
index bdc9cb9d1d7..095a32f7a98 100644
--- a/reactos/dll/cpl/access/general.c
+++ b/reactos/dll/cpl/access/general.c
@@ -15,55 +15,48 @@
 
 /* Property page dialog callback */
 INT_PTR CALLBACK
-GeneralPageProc(
-  HWND hwndDlg,
-  UINT uMsg,
-  WPARAM wParam,
-  LPARAM lParam
-)
+GeneralPageProc(HWND hwndDlg,
+                UINT uMsg,
+                WPARAM wParam,
+                LPARAM lParam)
 {
-  UNREFERENCED_PARAMETER(lParam);
-  UNREFERENCED_PARAMETER(hwndDlg);
-  switch(uMsg)
-  {
-    case WM_INITDIALOG:
-      break;
-    case WM_COMMAND:
+    UNREFERENCED_PARAMETER(lParam);
+    UNREFERENCED_PARAMETER(hwndDlg);
+
+    switch (uMsg)
     {
-      switch(LOWORD(wParam))
-      {      
-        case IDC_RESET_BOX:
-        {
-          break;
-        }
-        case IDC_NOTIFICATION_MESSAGE:
-        {
-          break;
-        }
-        case IDC_NOTIFICATION_SOUND:
-        {
-          break;
-        }
-        case IDC_SERIAL_BOX:
-        {
-          break;
-        }
-        case IDC_SERIAL_BUTTON:
-        {
-          break;
-        }
-        case IDC_ADMIN_LOGON_BOX:
-        {
-          break;
-        }
-        case IDC_ADMIN_USERS_BOX:
-        {
-          break;
-        }
-        default:
-         break;
-      }
+        case WM_INITDIALOG:
+            break;
+
+        case WM_COMMAND:
+            switch (LOWORD(wParam))
+            {
+                case IDC_RESET_BOX:
+                    break;
+
+                case IDC_NOTIFICATION_MESSAGE:
+                    break;
+
+                case IDC_NOTIFICATION_SOUND:
+                    break;
+
+                case IDC_SERIAL_BOX:
+                    break;
+
+                case IDC_SERIAL_BUTTON:
+                    break;
+
+                case IDC_ADMIN_LOGON_BOX:
+                    break;
+
+                case IDC_ADMIN_USERS_BOX:
+                    break;
+
+                default:
+                    break;
+            }
+            break;
     }
-  }
-  return FALSE;
+
+    return FALSE;
 }
diff --git a/reactos/dll/cpl/access/keyboard.c b/reactos/dll/cpl/access/keyboard.c
index d5e2380cb7b..a16f527b396 100644
--- a/reactos/dll/cpl/access/keyboard.c
+++ b/reactos/dll/cpl/access/keyboard.c
@@ -25,37 +25,34 @@ typedef struct _GLOBAL_DATA
 
 /* Property page dialog callback */
 INT_PTR CALLBACK
-StickyKeysDlgProc(
-  HWND hwndDlg,
-  UINT uMsg,
-  WPARAM wParam,
-  LPARAM lParam
-)
+StickyKeysDlgProc(HWND hwndDlg,
+                  UINT uMsg,
+                  WPARAM wParam,
+                  LPARAM lParam)
 {
-  UNREFERENCED_PARAMETER(lParam);
-  UNREFERENCED_PARAMETER(hwndDlg);
-  switch(uMsg)
-  {
-    case WM_INITDIALOG:
-      break;
-    case WM_COMMAND:
+    switch (uMsg)
     {
-      switch(LOWORD(wParam))
-      {
-        case IDOK:
-          EndDialog(hwndDlg, TRUE);
-          break;
+        case WM_INITDIALOG:
+            break;
 
-        case IDCANCEL:
-          EndDialog(hwndDlg, FALSE);
-          break;
+        case WM_COMMAND:
+            switch (LOWORD(wParam))
+            {
+                case IDOK:
+                    EndDialog(hwndDlg, TRUE);
+                    break;
 
-        default:
-          break;
-      }
+                case IDCANCEL:
+                    EndDialog(hwndDlg, FALSE);
+                    break;
+
+                default:
+                    break;
+            }
+            break;
     }
-  }
-  return FALSE;
+
+    return FALSE;
 }
 
 
diff --git a/reactos/dll/cpl/access/mouse.c b/reactos/dll/cpl/access/mouse.c
index 769257ac933..0fc2da8ec92 100644
--- a/reactos/dll/cpl/access/mouse.c
+++ b/reactos/dll/cpl/access/mouse.c
@@ -15,35 +15,32 @@
 
 /* Property page dialog callback */
 INT_PTR CALLBACK
-MousePageProc(
-  HWND hwndDlg,
-  UINT uMsg,
-  WPARAM wParam,
-  LPARAM lParam
-)
+MousePageProc(HWND hwndDlg,
+              UINT uMsg,
+              WPARAM wParam,
+              LPARAM lParam)
 {
-  UNREFERENCED_PARAMETER(lParam);
-  UNREFERENCED_PARAMETER(hwndDlg);
-  switch(uMsg)
-  {
-    case WM_INITDIALOG:
-      break;
-    case WM_COMMAND:
+    UNREFERENCED_PARAMETER(lParam);
+    UNREFERENCED_PARAMETER(hwndDlg);
+
+    switch (uMsg)
     {
-      switch(LOWORD(wParam))
-      {      
-        case IDC_MOUSE_BOX:
-        {
-          break;
-        }
-        case IDC_MOUSE_BUTTON:
-        {
-          break;
-        }
-        default:
-          break;
-      }
+        case WM_INITDIALOG:
+            break;
+        case WM_COMMAND:
+            switch (LOWORD(wParam))
+            {
+                case IDC_MOUSE_BOX:
+                    break;
+
+                case IDC_MOUSE_BUTTON:
+                    break;
+
+                default:
+                    break;
+            }
+            break;
     }
-  }
-  return FALSE;
+
+    return FALSE;
 }
diff --git a/reactos/dll/cpl/access/sound.c b/reactos/dll/cpl/access/sound.c
index dad0dfcc87d..2360fe68600 100644
--- a/reactos/dll/cpl/access/sound.c
+++ b/reactos/dll/cpl/access/sound.c
@@ -15,39 +15,35 @@
 
 /* Property page dialog callback */
 INT_PTR CALLBACK
-SoundPageProc(
-  HWND hwndDlg,
-  UINT uMsg,
-  WPARAM wParam,
-  LPARAM lParam
-)
+SoundPageProc(HWND hwndDlg,
+              UINT uMsg,
+              WPARAM wParam,
+              LPARAM lParam)
 {
-  UNREFERENCED_PARAMETER(lParam);
-  UNREFERENCED_PARAMETER(hwndDlg);
-  switch(uMsg)
-  {
-    case WM_INITDIALOG:
-      break;
-    case WM_COMMAND:
+    UNREFERENCED_PARAMETER(lParam);
+    UNREFERENCED_PARAMETER(hwndDlg);
+
+    switch (uMsg)
     {
-      switch(LOWORD(wParam))
-      {
-        case IDC_SENTRY_BOX:
-        {
-          break;
-        }
-        case IDC_SENTRY_BUTTON:
-        {
-          break;
-        }
-        case IDC_SSHOW_BOX:
-        {
-          break;
-        }
-        default:  
-          break;
-      }
+        case WM_INITDIALOG:
+            break;
+        case WM_COMMAND:
+            switch (LOWORD(wParam))
+            {
+                case IDC_SENTRY_BOX:
+                    break;
+
+                case IDC_SENTRY_BUTTON:
+                    break;
+
+                case IDC_SSHOW_BOX:
+                    break;
+
+                default:
+                    break;
+            }
+            break;
     }
-  }
-  return FALSE;
+
+    return FALSE;
 }