diff --git a/grid.c b/grid.c
index d06e7154..d9b3c716 100644
--- a/grid.c
+++ b/grid.c
@@ -644,7 +644,7 @@ grid_string_cells(struct grid *gd, u_int px, u_int py, u_int nx,
         if (trim) {
 		while (off > 0 && buf[off - 1] == ' ')
 			off--;
-        }
+	}
 	buf[off] = '\0';
 
 	return (buf);
diff --git a/options.c b/options.c
index ec036741..51a6608e 100644
--- a/options.c
+++ b/options.c
@@ -26,7 +26,7 @@
 
 /*
  * Option handling; each option has a name, type and value and is stored in
- * a splay tree.
+ * a red-black tree.
  */
 
 RB_GENERATE(options_tree, options_entry, entry, options_cmp);
diff --git a/window-choose.c b/window-choose.c
index 70c20085..77add5e4 100644
--- a/window-choose.c
+++ b/window-choose.c
@@ -345,8 +345,7 @@ window_choose_collapse(struct window_pane *wp, struct session *s)
 	 * assign the actual result we want to render and copy the new one over
 	 * the top of it.
 	 */
-	for (i = 0; i < ARRAY_LENGTH(&data->list); i++)
-	{
+	for (i = 0; i < ARRAY_LENGTH(&data->list); i++) {
 		item = &ARRAY_ITEM(&data->list, i);
 		wcd = item->wcd;