diff --git a/demos/assets.c b/demos/assets.c
index 7dfaa2b22..b0bb9ff81 100644
--- a/demos/assets.c
+++ b/demos/assets.c
@@ -71,7 +71,7 @@ static ret_t widget_set_theme_without_file_system(widget_t* widget, const char*
   log_debug("theme changed: %s\n", name);
 
   return RET_OK;
-#else /*WITH_FS_RES*/
+#else  /*WITH_FS_RES*/
   return RET_NOT_IMPL;
 #endif /*WITH_FS_RES*/
 }
diff --git a/demos/assets_dark.inc b/demos/assets_dark.inc
index 7f14f5067..7f300345e 100644
--- a/demos/assets_dark.inc
+++ b/demos/assets_dark.inc
@@ -442,7 +442,7 @@ extern TK_CONST_DATA_ALIGN(const unsigned char image_girl[]);
 extern TK_CONST_DATA_ALIGN(const unsigned char font_ap[]);
 extern TK_CONST_DATA_ALIGN(const unsigned char font_default_full[]);
 extern TK_CONST_DATA_ALIGN(const unsigned char font_default[]);
-#else/*WITH_STB_FONT or WITH_FT_FONT*/
+#else  /*WITH_STB_FONT or WITH_FT_FONT*/
 extern TK_CONST_DATA_ALIGN(const unsigned char font_default_20[]);
 extern TK_CONST_DATA_ALIGN(const unsigned char font_default_16[]);
 extern TK_CONST_DATA_ALIGN(const unsigned char font_default_18[]);
@@ -756,7 +756,7 @@ ret_t assets_init_dark(void) {
   assets_manager_add(am, font_ap);
   assets_manager_add(am, font_default_full);
   assets_manager_add(am, font_default);
-#else /*WITH_STB_FONT or WITH_FT_FONT*/
+#else  /*WITH_STB_FONT or WITH_FT_FONT*/
   assets_manager_add(am, font_default_20);
   assets_manager_add(am, font_default_16);
   assets_manager_add(am, font_default_18);
diff --git a/demos/assets_default.inc b/demos/assets_default.inc
index 17f1afea9..49f90af97 100644
--- a/demos/assets_default.inc
+++ b/demos/assets_default.inc
@@ -442,7 +442,7 @@
 #include "assets/default/inc/fonts/ap.res"
 #include "assets/default/inc/fonts/default_full.res"
 #include "assets/default/inc/fonts/default.res"
-#else/*WITH_STB_FONT or WITH_FT_FONT*/
+#else /*WITH_STB_FONT or WITH_FT_FONT*/
 #include "assets/default/inc/fonts/default_20.data"
 #include "assets/default/inc/fonts/default_16.data"
 #include "assets/default/inc/fonts/default_18.data"
@@ -756,7 +756,7 @@ ret_t assets_init_default(void) {
   assets_manager_add(am, font_ap);
   assets_manager_add(am, font_default_full);
   assets_manager_add(am, font_default);
-#else /*WITH_STB_FONT or WITH_FT_FONT*/
+#else  /*WITH_STB_FONT or WITH_FT_FONT*/
   assets_manager_add(am, font_default_20);
   assets_manager_add(am, font_default_16);
   assets_manager_add(am, font_default_18);
diff --git a/tests/utf8_test.cc b/tests/utf8_test.cc
index 5c7c2ba6f..9785984b0 100644
--- a/tests/utf8_test.cc
+++ b/tests/utf8_test.cc
@@ -14,7 +14,7 @@ TEST(Utf8, ascii) {
 static void dump_utf8(const char* str) {
   const char* p = str;
   log_debug("dump_utf8:%s\n", str);
-  while(*p) {
+  while (*p) {
     log_debug("%02x ", ((int)(*p) & 0xff));
     p++;
   }
@@ -25,7 +25,7 @@ static void dump_utf8(const char* str) {
 static void dump_unicode(const wchar_t* str) {
   const wchar_t* p = str;
   log_debug("dump_unicode\n");
-  while(*p) {
+  while (*p) {
     log_debug("%04x ", (int)(*p));
     p++;
   }