diff --git a/src/arch/arm64/include/armv8/arch/lib_helpers.h b/src/arch/arm64/include/armv8/arch/lib_helpers.h
index 19bb18d..f4b6ba6 100644
--- a/src/arch/arm64/include/armv8/arch/lib_helpers.h
+++ b/src/arch/arm64/include/armv8/arch/lib_helpers.h
@@ -307,7 +307,7 @@
 		break;					\
 	}						\
 	return var;					\
-	} while(0)
+	} while (0)
 
 #define SWITCH_CASE_WRITE(func, var, el)	do {	\
 	switch(el) {					\
@@ -321,7 +321,7 @@
 		func##_el3(var);			\
 		break;					\
 	}						\
-	} while(0)
+	} while (0)
 
 #define SWITCH_CASE_TLBI(func, el) do {		\
 	switch(el) {				\
@@ -335,7 +335,7 @@
 		func##_el3();			\
 			break;			\
 	}					\
-	} while(0)
+	} while (0)
 
 /* PSTATE and special purpose register access functions */
 uint32_t raw_read_current_el(void);
diff --git a/src/mainboard/via/epia-m700/romstage.c b/src/mainboard/via/epia-m700/romstage.c
index 0aeec7a..6bf7a15 100644
--- a/src/mainboard/via/epia-m700/romstage.c
+++ b/src/mainboard/via/epia-m700/romstage.c
@@ -360,7 +360,7 @@
 	outb(0x00, ComBase + 4);
 
 	/* SOutput("Embedded COM output\n"); */
-	/* while(1); */
+	/* while (1); */
 }
 #endif