diff --git a/.clang-format b/.clang-format
index 1fc9898d0..6493bd0b2 100644
--- a/.clang-format
+++ b/.clang-format
@@ -3,8 +3,8 @@ Language:        Cpp
 
 AlignConsecutiveMacros:
   Enabled:         true
-  AcrossEmptyLines: false
-  AcrossComments:  false
+  AcrossEmptyLines: true
+  AcrossComments:  true
   AlignCompound:   false
   AlignFunctionPointers: false
   PadOperators:    false
diff --git a/Balloon/sys/ProtoTypes.h b/Balloon/sys/ProtoTypes.h
index a5aadc118..8e842e6e8 100644
--- a/Balloon/sys/ProtoTypes.h
+++ b/Balloon/sys/ProtoTypes.h
@@ -35,7 +35,7 @@
 #include "trace.h"
 
 /* The ID for virtio_balloon */
-#define VIRTIO_ID_BALLOON 5
+#define VIRTIO_ID_BALLOON               5
 
 /* The feature bitmap for virtio balloon */
 #define VIRTIO_BALLOON_F_MUST_TELL_HOST 0 /* Tell before reclaiming pages */
diff --git a/Balloon/sys/trace.h b/Balloon/sys/trace.h
index 92a1a5bf9..ec34f629e 100644
--- a/Balloon/sys/trace.h
+++ b/Balloon/sys/trace.h
@@ -96,11 +96,11 @@ extern int driverDebugLevel;
                             WPP_DEFINE_BIT(DBG_HW_ACCESS)    /* bit 12 = 0x00001000 */                                 \
     )
 
-#define WPP_FLAG_LEVEL_LOGGER(flag, level) WPP_LEVEL_LOGGER(flag)
+#define WPP_FLAG_LEVEL_LOGGER(flag, level)  WPP_LEVEL_LOGGER(flag)
 
 #define WPP_FLAG_LEVEL_ENABLED(flag, level) (WPP_LEVEL_ENABLED(flag) && WPP_CONTROL(WPP_BIT_##flag).Level >= level)
 
-#define WPP_LEVEL_FLAGS_LOGGER(lvl, flags) WPP_LEVEL_LOGGER(flags)
+#define WPP_LEVEL_FLAGS_LOGGER(lvl, flags)  WPP_LEVEL_LOGGER(flags)
 
 #define WPP_LEVEL_FLAGS_ENABLED(lvl, flags) (WPP_LEVEL_ENABLED(flags) && WPP_CONTROL(WPP_BIT_##flags).Level >= lvl)