diff --git a/examples/registry_cli/Makefile b/examples/registry_cli/Makefile
index cf28607b1a0d..3469f6d2a238 100644
--- a/examples/registry_cli/Makefile
+++ b/examples/registry_cli/Makefile
@@ -17,8 +17,6 @@ USEMODULE += mtd
 USEMODULE +=  registry_string_path
 USEMODULE +=  registry_storage_vfs
 USEMODULE +=  registry_namespace_sys_rgb_led
-USEMODULE +=  registry_namespace_tests_full
-USEMODULE +=  registry_namespace_tests_nested
 
 # Comment this out to disable code in RIOT that does safety checking
 # which is not needed in a production environment but helps in the
diff --git a/examples/registry_cli/main.c b/examples/registry_cli/main.c
index f46294872359..4117f224176f 100644
--- a/examples/registry_cli/main.c
+++ b/examples/registry_cli/main.c
@@ -32,95 +32,99 @@
 #include "registry/namespace/sys/rgb_led.h"
 #include "registry/storage.h"
 #include "registry/string_path.h"
-#include "registry/namespace/tests.h"
-#include "registry/namespace/tests/nested.h"
 
-int rgb_led_instance_0_commit_cb(const registry_commit_cb_scope_t scope,
+/* this callback is usually implemented drivers such as an RGB LED driver */
+int rgb_led_instance_commit_cb(const registry_commit_cb_scope_t scope,
                                  const registry_group_or_parameter_id_t *group_or_parameter_id,
                                  const void *context)
 {
-    (void)scope;
     (void)context;
     printf("RGB instance commit_cb was executed on ");
 
-    if (group_or_parameter_id != NULL) {
-        printf("param: %d", *group_or_parameter_id);
+    /* check how much of the registry instance was committed */
+    switch (scope)
+    {
+    case REGISTRY_COMMIT_INSTANCE:
+        /* in this case the whole instance and all parameters inside of it was committed */
+        printf("the whole instance");
+        break;
+    case REGISTRY_COMMIT_GROUP:
+        /* in this case a group and all parameters inside of it was committed */
+        printf("a group: %d\n", *group_or_parameter_id);
+        break;
+    case REGISTRY_COMMIT_PARAMETER:
+        /* in this case only a single parameter was committed */
+        printf("a single parameter: %d\n", *group_or_parameter_id);
+        break;
     }
-    else {
-        printf("whole instance");
-    }
-
-    printf("\n");
 
     return 0;
 }
 
-registry_sys_rgb_led_instance_t rgb_led_instance_0_data = {
+/* create instances of a configuration schema, to expose configuration parameters to the registry */
+static registry_sys_rgb_led_instance_t rgb_led_instance_0_data = {
     .red = 0,
     .green = 255,
     .blue = 70,
 };
-registry_instance_t rgb_led_instance_0 = {
+static registry_instance_t rgb_led_instance_0 = {
     .name = "rgb-0",
     .data = &rgb_led_instance_0_data,
-    .commit_cb = &rgb_led_instance_0_commit_cb,
+    .commit_cb = &rgb_led_instance_commit_cb,
 };
 
-registry_sys_rgb_led_instance_t rgb_led_instance_1_data = {
+/* this instance uses the same commit_cb function as instance 0 just for simplicity */
+/* normally each instance should have its own */
+static registry_sys_rgb_led_instance_t rgb_led_instance_1_data = {
     .red = 90,
     .green = 4,
     .blue = 0,
 };
-registry_instance_t rgb_led_instance_1 = {
+static registry_instance_t rgb_led_instance_1 = {
     .name = "rgb-1",
     .data = &rgb_led_instance_1_data,
-    .commit_cb = &rgb_led_instance_0_commit_cb,
+    .commit_cb = &rgb_led_instance_commit_cb,
 };
 
+/* configure the registry storage to use littlefs2 */
 static littlefs2_desc_t fs_desc = {
     .lock = MUTEX_INIT,
 };
 
+/* set the mount point for the registry storage to /sda for this example */
 static vfs_mount_t _vfs_mount = {
     .fs = &littlefs2_file_system,
     .mount_point = "/sda",
     .private_data = &fs_desc,
 };
 
+/* create a storage instance to register the storage at the RIOT registry */
 static registry_storage_instance_t vfs_instance = {
     .storage = &registry_storage_vfs,
     .data = &_vfs_mount,
 };
 
+/* the storage source is where the registry reads parameter values from */
 REGISTRY_ADD_STORAGE_SOURCE(vfs_instance);
-REGISTRY_SET_STORAGE_DESTINATION(vfs_instance);
-
-static registry_tests_nested_instance_t test_nested_instance_data = {
-    .parameter = 9,
-    .group_parameter = 5,
-};
 
-static registry_instance_t test_nested_instance = {
-    .name = "instance-1",
-    .data = &test_nested_instance_data,
-    .commit_cb = NULL,
-};
+/* the storage destination is where the registry writes parameter values to */
+REGISTRY_SET_STORAGE_DESTINATION(vfs_instance);
 
 int main(void)
 {
+    /* initialize the riot registry storage for persistent configuration parameters */
+    #if IS_USED(MODULE_LITTLEFS2)
+    fs_desc.dev = MTD_0;
+    #endif
+
+    /* initialize the riot registry */
     registry_init();
 
-    /* init schemas */
+    /* add configuration schemas to the registry */
     registry_add_schema_instance(&registry_sys_rgb_led, &rgb_led_instance_0);
     registry_add_schema_instance(&registry_sys_rgb_led, &rgb_led_instance_1);
-    registry_add_schema_instance(&registry_tests_nested, &test_nested_instance);
-
-    /* init storage */
-    #if IS_USED(MODULE_LITTLEFS2)
-    fs_desc.dev = MTD_0;
-    #endif
 
-    /* init and run CLI */
+    /* initialize and run the RIOT shell */
     char line_buf[SHELL_DEFAULT_BUFSIZE];
     shell_run(NULL, line_buf, sizeof(line_buf));
     return 0;