diff --git a/hal/halarm/generic/halinit.c b/hal/halarm/generic/halinit.c
index 24836de2a23..76adb5c1681 100644
--- a/hal/halarm/generic/halinit.c
+++ b/hal/halarm/generic/halinit.c
@@ -16,20 +16,21 @@
 
 /* PRIVATE FUNCTIONS **********************************************************/
 
+static
+CODE_SEG("INIT")
 VOID
-NTAPI
-HalpGetParameters(IN PLOADER_PARAMETER_BLOCK LoaderBlock)
+HalpGetParameters(
+    _In_ PLOADER_PARAMETER_BLOCK LoaderBlock)
 {
-    PCHAR CommandLine;
-
     /* Make sure we have a loader block and command line */
-    if ((LoaderBlock) && (LoaderBlock->LoadOptions))
+    if (LoaderBlock && LoaderBlock->LoadOptions)
     {
         /* Read the command line */
-        CommandLine = LoaderBlock->LoadOptions;
+        PCSTR CommandLine = LoaderBlock->LoadOptions;
 
         /* Check for initial breakpoint */
-        if (strstr(CommandLine, "BREAK")) DbgBreakPoint();
+        if (strstr(CommandLine, "BREAK"))
+            DbgBreakPoint();
     }
 }
 
@@ -38,15 +39,17 @@ HalpGetParameters(IN PLOADER_PARAMETER_BLOCK LoaderBlock)
 /*
  * @implemented
  */
+CODE_SEG("INIT")
 BOOLEAN
 NTAPI
-HalInitSystem(IN ULONG BootPhase,
-              IN PLOADER_PARAMETER_BLOCK LoaderBlock)
+HalInitSystem(
+    _In_ ULONG BootPhase,
+    _In_ PLOADER_PARAMETER_BLOCK LoaderBlock)
 {
     PKPRCB Prcb = KeGetCurrentPrcb();
 
     /* Check the boot phase */
-    if (!BootPhase)
+    if (BootPhase == 0)
     {
         /* Get command-line parameters */
         HalpGetParameters(LoaderBlock);
diff --git a/hal/halx86/generic/halinit.c b/hal/halx86/generic/halinit.c
index be32ed7644d..cc962bdb4c9 100644
--- a/hal/halx86/generic/halinit.c
+++ b/hal/halx86/generic/halinit.c
@@ -18,24 +18,25 @@ BOOLEAN HalpPciLockSettings;
 
 /* PRIVATE FUNCTIONS *********************************************************/
 
+static
 CODE_SEG("INIT")
 VOID
-NTAPI
-HalpGetParameters(IN PLOADER_PARAMETER_BLOCK LoaderBlock)
+HalpGetParameters(
+    _In_ PLOADER_PARAMETER_BLOCK LoaderBlock)
 {
-    PCHAR CommandLine;
-
     /* Make sure we have a loader block and command line */
-    if ((LoaderBlock) && (LoaderBlock->LoadOptions))
+    if (LoaderBlock && LoaderBlock->LoadOptions)
     {
         /* Read the command line */
-        CommandLine = LoaderBlock->LoadOptions;
+        PCSTR CommandLine = LoaderBlock->LoadOptions;
 
         /* Check if PCI is locked */
-        if (strstr(CommandLine, "PCILOCK")) HalpPciLockSettings = TRUE;
+        if (strstr(CommandLine, "PCILOCK"))
+            HalpPciLockSettings = TRUE;
 
         /* Check for initial breakpoint */
-        if (strstr(CommandLine, "BREAK")) DbgBreakPoint();
+        if (strstr(CommandLine, "BREAK"))
+            DbgBreakPoint();
     }
 }
 
@@ -70,8 +71,9 @@ HalInitializeProcessor(
 CODE_SEG("INIT")
 BOOLEAN
 NTAPI
-HalInitSystem(IN ULONG BootPhase,
-              IN PLOADER_PARAMETER_BLOCK LoaderBlock)
+HalInitSystem(
+    _In_ ULONG BootPhase,
+    _In_ PLOADER_PARAMETER_BLOCK LoaderBlock)
 {
     PKPRCB Prcb = KeGetCurrentPrcb();
     NTSTATUS Status;
@@ -79,7 +81,7 @@ HalInitSystem(IN ULONG BootPhase,
     /* Check the boot phase */
     if (BootPhase == 0)
     {
-        /* Phase 0... save bus type */
+        /* Save bus type */
         HalpBusType = LoaderBlock->u.I386.MachineType & 0xFF;
 
         /* Get command-line parameters */