diff --git a/term_util.c b/term_util.c
index cbc2266..f4e681a 100644
--- a/term_util.c
+++ b/term_util.c
@@ -40,8 +40,7 @@ struct Qmsg {
 
 struct Qmenu_item_extra {
   int user_id;
-  U8 owns_string : 1;
-  U8 is_spacer : 1;
+  U8 owns_string : 1, is_spacer : 1;
 };
 
 struct Qmenu {
@@ -65,11 +64,7 @@ struct Qform {
 
 Qnav_stack qnav_stack;
 
-void qnav_init() {
-  qnav_stack.count = 0;
-  qnav_stack.stack_changed = false;
-  memset(qnav_stack.blocks, 0, sizeof(qnav_stack.blocks));
-}
+void qnav_init() { qnav_stack = (Qnav_stack){.blocks = {0}}; }
 void qnav_deinit() {
   while (qnav_stack.count != 0)
     qnav_stack_pop();
diff --git a/term_util.h b/term_util.h
index 365dc6f..9e0735d 100644
--- a/term_util.h
+++ b/term_util.h
@@ -58,8 +58,7 @@ typedef enum {
 
 typedef struct {
   Qblock_type_tag tag;
-  WINDOW *outer_window;
-  WINDOW *content_window;
+  WINDOW *outer_window, *content_window;
   char const *title;
   int y, x;
 } Qblock;