diff --git a/.github/workflows/clang-format-check.yaml b/.github/workflows/clang-format-check.yaml
index 8d5fd776..0ec5291a 100644
--- a/.github/workflows/clang-format-check.yaml
+++ b/.github/workflows/clang-format-check.yaml
@@ -9,11 +9,19 @@ jobs:
   formatting-check:
     name: Formatting Check
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        path:
+          - check: 'src'
+            exclude: 'src/components/(cmd_nvs|cmd_system)'
+          - check: 'examples'
+            exclude: ''
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Run clang-format style check for C/C++/Protobuf programs.
-      uses: jidicula/clang-format-action@v4.6.2
+      uses: jidicula/clang-format-action@v4.11.0
       with:
         clang-format-version: '13'
-        check-path: 'src'
-        exclude-regex: 'src/components/(cmd_nvs|cmd_system)'
+        check-path: ${{ matrix.path['check'] }}
+        exclude-regex: ${{ matrix.path['exclude'] }}
+
diff --git a/examples/esp32/main/main.c b/examples/esp32/main/main.c
index a6e62d18..6f81e026 100644
--- a/examples/esp32/main/main.c
+++ b/examples/esp32/main/main.c
@@ -7,7 +7,7 @@
 #include <btstack_run_loop.h>
 
 #include "sdkconfig.h"
-#include "uni_main.h"
+#include "uni_init.h"
 #include "uni_platform.h"
 
 // Sanity check
@@ -27,12 +27,12 @@ int app_main(void) {
     // hci_dump_init(hci_dump_embedded_stdout_get_instance());
 
 #ifdef CONFIG_BLUEPAD32_PLATFORM_CUSTOM
-    // Must be called before uni_main()
+    // Must be called before uni_init()
     uni_platform_set_custom(get_my_platform());
 #endif  // CONFIG_BLUEPAD32_PLATFORM_CUSTOM
 
     // Init Bluepad32.
-    uni_main(0 /* argc */, NULL /* argv */);
+    uni_init(0 /* argc */, NULL /* argv */);
 
     // Does not return.
     btstack_run_loop_execute();
diff --git a/examples/linux/Makefile b/examples/linux/Makefile
index 66df8a4f..11c17d10 100644
--- a/examples/linux/Makefile
+++ b/examples/linux/Makefile
@@ -105,10 +105,10 @@ bluepad32: ${CORE_OBJ} ${COMMON_OBJ} ${CLASSIC_OBJ} ${SDP_CLIENT} btstack_ring_b
 	${BLUEPAD32_ROOT}/uni_hid_parser_switch.o \
 	${BLUEPAD32_ROOT}/uni_hid_parser_wii.o \
 	${BLUEPAD32_ROOT}/uni_hid_parser_xboxone.o \
+	${BLUEPAD32_ROOT}/uni_init.o \
 	${BLUEPAD32_ROOT}/uni_joystick.o \
 	${BLUEPAD32_ROOT}/uni_keyboard.o \
 	${BLUEPAD32_ROOT}/uni_log.o \
-	${BLUEPAD32_ROOT}/uni_main.o \
 	${BLUEPAD32_ROOT}/uni_mouse.o \
 	${BLUEPAD32_ROOT}/uni_platform.o \
 	${BLUEPAD32_ROOT}/uni_property.o \
diff --git a/examples/linux/main.c b/examples/linux/main.c
index 7731b71c..b6690b93 100644
--- a/examples/linux/main.c
+++ b/examples/linux/main.c
@@ -44,13 +44,13 @@
 // *****************************************************************************
 
 #include <getopt.h>
+#include <hci_dump_posix_stdout.h>
+#include <signal.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <signal.h>
 #include <unistd.h>
-#include <hci_dump_posix_stdout.h>
 
 #include "btstack_config.h"
 
@@ -77,7 +77,7 @@
 
 // Bluepad32 related
 #include "sdkconfig.h"
-#include "uni_main.h"
+#include "uni_init.h"
 #include "uni_platform.h"
 
 // Local includes
@@ -89,11 +89,11 @@
 #define TLV_DB_PATH_POSTFIX ".tlv"
 static char tlv_db_path[100];
 static bool tlv_reset;
-static const btstack_tlv_t * tlv_impl;
-static btstack_tlv_posix_t   tlv_context;
-static bd_addr_t             local_addr;
+static const btstack_tlv_t* tlv_impl;
+static btstack_tlv_posix_t tlv_context;
+static bd_addr_t local_addr;
 
-int btstack_main(int argc, const char * argv[]);
+int btstack_main(int argc, const char* argv[]);
 
 static bd_addr_t static_address;
 static int using_static_address;
@@ -103,19 +103,19 @@ static btstack_packet_callback_registration_t hci_event_callback_registration;
 // shutdown
 static bool shutdown_triggered;
 
-static void local_version_information_handler(uint8_t * packet){
+static void local_version_information_handler(uint8_t* packet) {
     printf("Local version information:\n");
-    uint16_t hci_version    = packet[6];
-    uint16_t hci_revision   = little_endian_read_16(packet, 7);
-    uint16_t lmp_version    = packet[9];
-    uint16_t manufacturer   = little_endian_read_16(packet, 10);
+    uint16_t hci_version = packet[6];
+    uint16_t hci_revision = little_endian_read_16(packet, 7);
+    uint16_t lmp_version = packet[9];
+    uint16_t manufacturer = little_endian_read_16(packet, 10);
     uint16_t lmp_subversion = little_endian_read_16(packet, 12);
     printf("- HCI Version    0x%04x\n", hci_version);
     printf("- HCI Revision   0x%04x\n", hci_revision);
     printf("- LMP Version    0x%04x\n", lmp_version);
     printf("- LMP Subversion 0x%04x\n", lmp_subversion);
     printf("- Manufacturer   0x%04x\n", manufacturer);
-    switch (manufacturer){
+    switch (manufacturer) {
         case BLUETOOTH_COMPANY_ID_THE_LINUX_FOUNDATION:
             printf("- Linux Foundation - assume Zephyr hci_usb firmware running on nRF52xx\n");
             // setup Zephyr chipset support
@@ -128,19 +128,20 @@ static void local_version_information_handler(uint8_t * packet){
     }
 }
 
-static void packet_handler (uint8_t packet_type, uint16_t channel, uint8_t *packet, uint16_t size){
+static void packet_handler(uint8_t packet_type, uint16_t channel, uint8_t* packet, uint16_t size) {
     UNUSED(channel);
     UNUSED(size);
     uint8_t i;
     uint8_t usb_path_len;
-    const uint8_t * usb_path;
+    const uint8_t* usb_path;
     uint16_t product_id;
     uint16_t vendor_id;
-    const uint8_t * params;
+    const uint8_t* params;
 
-    if (packet_type != HCI_EVENT_PACKET) return;
+    if (packet_type != HCI_EVENT_PACKET)
+        return;
 
-    switch (hci_event_packet_get_type(packet)){
+    switch (hci_event_packet_get_type(packet)) {
         case HCI_EVENT_TRANSPORT_USB_INFO:
             usb_path_len = hci_event_transport_usb_info_get_path_len(packet);
             usb_path = hci_event_transport_usb_info_get_path(packet);
@@ -148,8 +149,9 @@ static void packet_handler (uint8_t packet_type, uint16_t channel, uint8_t *pack
             product_id = hci_event_transport_usb_info_get_product_id(packet);
             vendor_id = hci_event_transport_usb_info_get_vendor_id(packet);
             printf("USB device 0x%04x/0x%04x, path: ", vendor_id, product_id);
-            for (i=0;i<usb_path_len;i++){
-                if (i) printf("-");
+            for (i = 0; i < usb_path_len; i++) {
+                if (i)
+                    printf("-");
                 printf("%02x", usb_path[i]);
             }
             printf("\n");
@@ -163,17 +165,17 @@ static void packet_handler (uint8_t packet_type, uint16_t channel, uint8_t *pack
             }
             break;
         case BTSTACK_EVENT_STATE:
-            switch (btstack_event_state_get_state(packet)){
+            switch (btstack_event_state_get_state(packet)) {
                 case HCI_STATE_WORKING:
                     gap_local_bd_addr(local_addr);
-                    if (using_static_address){
+                    if (using_static_address) {
                         memcpy(local_addr, static_address, 6);
                     }
                     btstack_strcpy(tlv_db_path, sizeof(tlv_db_path), TLV_DB_PATH_PREFIX);
                     btstack_strcat(tlv_db_path, sizeof(tlv_db_path), bd_addr_to_str_with_delimiter(local_addr, '-'));
                     btstack_strcat(tlv_db_path, sizeof(tlv_db_path), TLV_DB_PATH_POSTFIX);
                     printf("TLV path: %s", tlv_db_path);
-                    if (tlv_reset){
+                    if (tlv_reset) {
                         int rc = unlink(tlv_db_path);
                         if (rc == 0) {
                             printf(", reset ok");
@@ -194,7 +196,8 @@ static void packet_handler (uint8_t packet_type, uint16_t channel, uint8_t *pack
                     break;
                 case HCI_STATE_OFF:
                     btstack_tlv_posix_deinit(&tlv_context);
-                    if (!shutdown_triggered) break;
+                    if (!shutdown_triggered)
+                        break;
                     // reset stdin
                     btstack_stdin_reset();
                     log_info("Good bye, see you.\n");
@@ -205,15 +208,15 @@ static void packet_handler (uint8_t packet_type, uint16_t channel, uint8_t *pack
             }
             break;
         case HCI_EVENT_COMMAND_COMPLETE:
-            switch (hci_event_command_complete_get_command_opcode(packet)){
+            switch (hci_event_command_complete_get_command_opcode(packet)) {
                 case HCI_OPCODE_HCI_READ_LOCAL_VERSION_INFORMATION:
                     local_version_information_handler(packet);
                     break;
                 case HCI_OPCODE_HCI_ZEPHYR_READ_STATIC_ADDRESS:
                     params = hci_event_command_complete_get_return_parameters(packet);
-                    if(params[0] != 0)
+                    if (params[0] != 0)
                         break;
-                    if(size < 13)
+                    if (size < 13)
                         break;
                     reverse_48(&params[2], static_address);
                     gap_random_address_set(static_address);
@@ -228,7 +231,7 @@ static void packet_handler (uint8_t packet_type, uint16_t channel, uint8_t *pack
     }
 }
 
-static void trigger_shutdown(void){
+static void trigger_shutdown(void) {
     printf("CTRL-C - SIGINT received, shutting down..\n");
     log_info("sigint_handler: shutting down");
     shutdown_triggered = true;
@@ -237,59 +240,57 @@ static void trigger_shutdown(void){
 
 static int led_state = 0;
 
-void hal_led_toggle(void){
+void hal_led_toggle(void) {
     led_state = 1 - led_state;
     printf("LED State %u\n", led_state);
 }
 
 static char short_options[] = "hu:l:r";
 
-static struct option long_options[] = {
-    {"help",        no_argument,        NULL,   'h'},
-    {"logfile",    required_argument,  NULL,   'l'},
-    {"reset-tlv",    no_argument,       NULL,   'r'},
-    {"usbpath",    required_argument,  NULL,   'u'},
-    {0, 0, 0, 0}
-};
+static struct option long_options[] = {{"help", no_argument, NULL, 'h'},
+                                       {"logfile", required_argument, NULL, 'l'},
+                                       {"reset-tlv", no_argument, NULL, 'r'},
+                                       {"usbpath", required_argument, NULL, 'u'},
+                                       {0, 0, 0, 0}};
 
-static char *help_options[] = {
+static char* help_options[] = {
     "print (this) help.",
     "set file to store debug output and HCI trace.",
     "reset bonding information stored in TLV.",
     "set USB path to Bluetooth Controller.",
 };
 
-static char *option_arg_name[] = {
+static char* option_arg_name[] = {
     "",
     "LOGFILE",
     "",
     "USBPATH",
 };
 
-static void usage(const char *name){
+static void usage(const char* name) {
     unsigned int i;
-    printf( "usage:\n\t%s [options]\n", name );
+    printf("usage:\n\t%s [options]\n", name);
     printf("valid options:\n");
-    for( i=0; long_options[i].name != 0; i++) {
-        printf("--%-10s| -%c  %-10s\t\t%s\n", long_options[i].name, long_options[i].val, option_arg_name[i], help_options[i] );
+    for (i = 0; long_options[i].name != 0; i++) {
+        printf("--%-10s| -%c  %-10s\t\t%s\n", long_options[i].name, long_options[i].val, option_arg_name[i],
+               help_options[i]);
     }
 }
 
 #define USB_MAX_PATH_LEN 7
-int main(int argc, const char * argv[]){
-
+int main(int argc, const char* argv[]) {
     uint8_t usb_path[USB_MAX_PATH_LEN];
     int usb_path_len = 0;
-    const char * usb_path_string = NULL;
-    const char * log_file_path = NULL;
+    const char* usb_path_string = NULL;
+    const char* log_file_path = NULL;
 
     // parse command line parameters
-    while(true){
-        int c = getopt_long( argc, (char* const *)argv, short_options, long_options, NULL );
+    while (true) {
+        int c = getopt_long(argc, (char* const*)argv, short_options, long_options, NULL);
         if (c < 0) {
             break;
         }
-        if (c == '?'){
+        if (c == '?') {
             break;
         }
         switch (c) {
@@ -309,49 +310,51 @@ int main(int argc, const char * argv[]){
         }
     }
 
-    if (usb_path_string != NULL){
+    if (usb_path_string != NULL) {
         // parse command line options for "-u 11:22:33"
         printf("Specified USB Path: ");
-        while (1){
-            char * delimiter;
+        while (1) {
+            char* delimiter;
             int port = strtol(usb_path_string, &delimiter, 16);
             usb_path[usb_path_len] = port;
             usb_path_len++;
             printf("%02x ", port);
-            if (!delimiter) break;
-            if (*delimiter != ':' && *delimiter != '-') break;
-            usb_path_string = delimiter+1;
+            if (!delimiter)
+                break;
+            if (*delimiter != ':' && *delimiter != '-')
+                break;
+            usb_path_string = delimiter + 1;
         }
         printf("\n");
     }
 
-	/// GET STARTED with BTstack ///
-	btstack_memory_init();
+    /// GET STARTED with BTstack ///
+    btstack_memory_init();
     btstack_run_loop_init(btstack_run_loop_posix_get_instance());
 
-    if (usb_path_len){
+    if (usb_path_len) {
         hci_transport_usb_set_path(usb_path_len, usb_path);
     }
 
     // log into file using HCI_DUMP_PACKETLOGGER format
     char pklg_path[100];
-    if (log_file_path == NULL){
-        btstack_strcpy(pklg_path, sizeof(pklg_path),  "/tmp/hci_dump");
-        if (usb_path_len){
-            btstack_strcat(pklg_path, sizeof(pklg_path),  "_");
-            btstack_strcat(pklg_path, sizeof(pklg_path),  usb_path_string);
+    if (log_file_path == NULL) {
+        btstack_strcpy(pklg_path, sizeof(pklg_path), "/tmp/hci_dump");
+        if (usb_path_len) {
+            btstack_strcat(pklg_path, sizeof(pklg_path), "_");
+            btstack_strcat(pklg_path, sizeof(pklg_path), usb_path_string);
         }
         btstack_strcat(pklg_path, sizeof(pklg_path), ".pklg");
         log_file_path = pklg_path;
     }
 
     hci_dump_posix_fs_open(log_file_path, HCI_DUMP_PACKETLOGGER);
-    const hci_dump_t * hci_dump_impl = hci_dump_posix_fs_get_instance();
+    const hci_dump_t* hci_dump_impl = hci_dump_posix_fs_get_instance();
     hci_dump_init(hci_dump_impl);
     printf("Packet Log: %s\n", log_file_path);
 
     // init HCI
-	hci_init(hci_transport_usb_instance(), NULL);
+    hci_init(hci_transport_usb_instance(), NULL);
 
 #ifdef HAVE_PORTAUDIO
     btstack_audio_sink_set_instance(btstack_audio_portaudio_sink_get_instance());
@@ -368,16 +371,16 @@ int main(int argc, const char * argv[]){
     // register known Realtek USB Controllers
     uint16_t realtek_num_controllers = btstack_chipset_realtek_get_num_usb_controllers();
     uint16_t i;
-    for (i=0;i<realtek_num_controllers;i++){
+    for (i = 0; i < realtek_num_controllers; i++) {
         uint16_t vendor_id;
         uint16_t product_id;
         btstack_chipset_realtek_get_vendor_product_id(i, &vendor_id, &product_id);
         hci_transport_usb_add_device(vendor_id, product_id);
     }
 
-    // Must be called before uni_main()
+    // Must be called before uni_init()
     uni_platform_set_custom(get_my_platform());
-    uni_main(argc, argv);
+    uni_init(argc, argv);
 
     // go: does not return
     btstack_run_loop_execute();
diff --git a/examples/pico_w/src/main.c b/examples/pico_w/src/main.c
index a0b8fb0c..67075519 100644
--- a/examples/pico_w/src/main.c
+++ b/examples/pico_w/src/main.c
@@ -6,8 +6,8 @@
 #include <pico/stdlib.h>
 
 #include "sdkconfig.h"
+#include "uni_init.h"
 #include "uni_log.h"
-#include "uni_main.h"
 #include "uni_platform.h"
 
 // Sanity check
@@ -30,11 +30,11 @@ int main() {
     // Turn-on LED. Turn it off once init is done.
     cyw43_arch_gpio_put(CYW43_WL_GPIO_LED_PIN, 1);
 
-    // Must be called before uni_main()
+    // Must be called before uni_init()
     uni_platform_set_custom(get_my_platform());
 
     // Initialize BP32
-    uni_main(0, NULL);
+    uni_init(0, NULL);
 
     // Does not return.
     btstack_run_loop_execute();
diff --git a/src/components/bluepad32/CMakeLists.txt b/src/components/bluepad32/CMakeLists.txt
index 702c4809..5b8d559c 100644
--- a/src/components/bluepad32/CMakeLists.txt
+++ b/src/components/bluepad32/CMakeLists.txt
@@ -28,10 +28,10 @@ set(srcs "uni_balance_board.c"
          "uni_hid_parser_switch.c"
          "uni_hid_parser_wii.c"
          "uni_hid_parser_xboxone.c"
+         "uni_init.c"
          "uni_joystick.c"
          "uni_keyboard.c"
          "uni_log.c"
-         "uni_main.c"
          "uni_mouse.c"
          "uni_platform.c"
          "uni_platform_arduino.c"
diff --git a/src/components/bluepad32/include/uni_main.h b/src/components/bluepad32/include/uni_init.h
similarity index 79%
rename from src/components/bluepad32/include/uni_main.h
rename to src/components/bluepad32/include/uni_init.h
index 2b99b8ef..59b344e0 100644
--- a/src/components/bluepad32/include/uni_main.h
+++ b/src/components/bluepad32/include/uni_init.h
@@ -16,9 +16,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ****************************************************************************/
 
-#ifndef UNI_MAIN_H
-#define UNI_MAIN_H
+#ifndef UNI_INIT_H
+#define UNI_INIT_H
 
-int uni_main(int argc, const char** argv);
+/* Initialize Bluepad32.
+ * argc / argv are parameters passed to the 'platform'
+ */
+int uni_init(int argc, const char** argv);
 
-#endif  // UNI_MAIN_H
+#endif  // UNI_INIT_H
diff --git a/src/components/bluepad32/uni_esp32.c b/src/components/bluepad32/uni_esp32.c
index d51c321d..7d9e4e8c 100644
--- a/src/components/bluepad32/uni_esp32.c
+++ b/src/components/bluepad32/uni_esp32.c
@@ -36,7 +36,7 @@ limitations under the License.
 #include <hci_dump_embedded_stdout.h>
 
 #include "uni_config.h"
-#include "uni_main.h"
+#include "uni_init.h"
 
 #ifdef UNI_ENABLE_BREDR
 _Static_assert(CONFIG_BTDM_CTRL_BR_EDR_MAX_ACL_CONN >= 2, "Max ACL must be >= 2");
diff --git a/src/components/bluepad32/uni_main.c b/src/components/bluepad32/uni_init.c
similarity index 94%
rename from src/components/bluepad32/uni_main.c
rename to src/components/bluepad32/uni_init.c
index ddc940e0..05efe6d8 100644
--- a/src/components/bluepad32/uni_main.c
+++ b/src/components/bluepad32/uni_init.c
@@ -16,7 +16,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ****************************************************************************/
 
-#include "uni_main.h"
+#include "uni_init.h"
 
 #include "sdkconfig.h"
 #include "uni_bt_allowlist.h"
@@ -31,8 +31,7 @@ limitations under the License.
 #include "uni_version.h"
 #include "uni_virtual_device.h"
 
-// Main entry point, runs forever
-int uni_main(int argc, const char** argv) {
+int uni_init(int argc, const char** argv) {
 #ifdef CONFIG_IDF_TARGET
     uni_esp32_init();
 #endif
diff --git a/src/main/main.c b/src/main/main.c
index 1186f273..cd2ebd45 100644
--- a/src/main/main.c
+++ b/src/main/main.c
@@ -21,7 +21,7 @@ limitations under the License.
 #include <btstack_run_loop.h>
 
 #include "sdkconfig.h"
-#include "uni_main.h"
+#include "uni_init.h"
 #include "uni_platform.h"
 
 #ifndef CONFIG_BLUEPAD32_PLATFORM_ARDUINO
@@ -41,7 +41,7 @@ int app_main(void) {
     // hci_dump_init(hci_dump_embedded_stdout_get_instance());
 
     // Init Bluepad32.
-    uni_main(0 /* argc */, NULL /* argv */);
+    uni_init(0 /* argc */, NULL /* argv */);
 
     // Does not return.
     btstack_run_loop_execute();