diff --git a/libplatsupport/plat_include/bcm2711/platsupport/plat/mailbox_util.h b/libplatsupport/plat_include/bcm2711/platsupport/plat/mailbox_util.h
index 20cf072..5746662 100644
--- a/libplatsupport/plat_include/bcm2711/platsupport/plat/mailbox_util.h
+++ b/libplatsupport/plat_include/bcm2711/platsupport/plat/mailbox_util.h
@@ -41,13 +41,21 @@
     DEVICE_ID_CCP2TX
 };
 
-// Property Tags: https://github.com/raspberrypi/firmware/wiki/Mailbox-property-interface
+////////////////////////////////////////////////////////////////////////////////
+//--------------------------------Property Tags-------------------------------//
+////////////////////////////////////////////////////////////////////////////////
+
+// See: https://github.com/raspberrypi/firmware/wiki/Mailbox-property-interface
 #define TAG_SET_POWER_STATE     0x00028001
 #define TAG_GET_CLOCK_RATE      0x00030002
 #define TAG_GET_MAC_ADDRESS     0x00010003
 
 // TODO: Add more property tags if needed
 
+////////////////////////////////////////////////////////////////////////////////
+//-----------------------------Request/Reponse Tags---------------------------//
+////////////////////////////////////////////////////////////////////////////////
+
 // See: https://github.com/raspberrypi/firmware/wiki/Mailbox-property-interface#set-power-state
 #define SET_POWER_STATE_OFF             (0u << 0)
 #define SET_POWER_STATE_ON              (1u << 0)
@@ -96,6 +104,10 @@
 
 // TODO: Add more request/reponse tags if needed
 
+////////////////////////////////////////////////////////////////////////////////
+//-----------------------------Mailbox Functions------------------------------//
+////////////////////////////////////////////////////////////////////////////////
+
 bool bcm2711_set_power_state_on(mailbox_t *mbox, uint32_t device_id);
 
 int bcm2711_get_clock_rate(mailbox_t *mbox, uint32_t clock_id);
diff --git a/libplatsupport/plat_include/bcm2837/platsupport/plat/mailbox_util.h b/libplatsupport/plat_include/bcm2837/platsupport/plat/mailbox_util.h
index 0c11d4e..c75fd0e 100644
--- a/libplatsupport/plat_include/bcm2837/platsupport/plat/mailbox_util.h
+++ b/libplatsupport/plat_include/bcm2837/platsupport/plat/mailbox_util.h
@@ -41,13 +41,21 @@
     DEVICE_ID_CCP2TX
 };
 
-// Property Tags: https://github.com/raspberrypi/firmware/wiki/Mailbox-property-interface
+////////////////////////////////////////////////////////////////////////////////
+//--------------------------------Property Tags-------------------------------//
+////////////////////////////////////////////////////////////////////////////////
+
+// See: https://github.com/raspberrypi/firmware/wiki/Mailbox-property-interface
 #define TAG_SET_POWER_STATE     0x00028001
 #define TAG_GET_CLOCK_RATE      0x00030002
 #define TAG_GET_MAC_ADDRESS     0x00010003
 
 // TODO: Add more property tags if needed
 
+////////////////////////////////////////////////////////////////////////////////
+//-----------------------------Request/Reponse Tags---------------------------//
+////////////////////////////////////////////////////////////////////////////////
+
 // See: https://github.com/raspberrypi/firmware/wiki/Mailbox-property-interface#set-power-state
 #define SET_POWER_STATE_OFF             (0u << 0)
 #define SET_POWER_STATE_ON              (1u << 0)
@@ -96,6 +104,10 @@
 
 // TODO: Add more request/reponse tags if needed
 
+////////////////////////////////////////////////////////////////////////////////
+//-----------------------------Mailbox Functions------------------------------//
+////////////////////////////////////////////////////////////////////////////////
+
 bool bcm2837_set_power_state_on(mailbox_t *mbox, uint32_t device_id);
 
 int bcm2837_get_clock_rate(mailbox_t *mbox, uint32_t clock_id);