diff --git a/cmd-find-window.c b/cmd-find-window.c
index deacf99c..88e48798 100644
--- a/cmd-find-window.c
+++ b/cmd-find-window.c
@@ -162,7 +162,7 @@ cmd_find_window_exec(struct cmd *self, struct cmd_q *cmdq)
 
 	xasprintf(&searchstr, "*%s*", str);
 	RB_FOREACH(wm, winlinks, &s->windows)
-	    cmd_find_window_match (&find_list, match_flags, wm, str, searchstr);
+	    cmd_find_window_match(&find_list, match_flags, wm, str, searchstr);
 	free(searchstr);
 
 	if (ARRAY_LENGTH(&find_list) == 0) {
diff --git a/key-bindings.c b/key-bindings.c
index 13ba9f25..00f73d73 100644
--- a/key-bindings.c
+++ b/key-bindings.c
@@ -167,16 +167,16 @@ key_bindings_init(void)
 
 	RB_INIT(&key_bindings);
 
-	cmdq = cmdq_new (NULL);
+	cmdq = cmdq_new(NULL);
 	for (i = 0; i < nitems(defaults); i++) {
 		error = cmd_string_parse(defaults[i], &cmdlist,
 		    "<default-keys>", i, &cause);
 		if (error != 0)
 			fatalx("bad default key");
-		cmdq_run (cmdq, cmdlist);
-		cmd_list_free (cmdlist);
+		cmdq_run(cmdq, cmdlist);
+		cmd_list_free(cmdlist);
 	}
-	cmdq_free (cmdq);
+	cmdq_free(cmdq);
 }
 
 void
diff --git a/server-client.c b/server-client.c
index bd7579fe..e0b0c668 100644
--- a/server-client.c
+++ b/server-client.c
@@ -160,7 +160,7 @@ server_client_lost(struct client *c)
 	evbuffer_free(c->stdin_data);
 	evbuffer_free(c->stdout_data);
 	if (c->stderr_data != c->stdout_data)
-		evbuffer_free (c->stderr_data);
+		evbuffer_free(c->stderr_data);
 
 	status_free_jobs(&c->status_new);
 	status_free_jobs(&c->status_old);
@@ -638,7 +638,7 @@ server_client_reset_state(struct client *c)
 	if (!window_pane_visible(wp) || wp->yoff + s->cy >= c->tty.sy - status)
 		tty_cursor(&c->tty, 0, 0);
 	else {
-		o = status && options_get_number (oo, "status-position") == 0;
+		o = status && options_get_number(oo, "status-position") == 0;
 		tty_cursor(&c->tty, wp->xoff + s->cx, o + wp->yoff + s->cy);
 	}
 
diff --git a/session.c b/session.c
index 0f8c1122..03ddb10d 100644
--- a/session.c
+++ b/session.c
@@ -127,7 +127,7 @@ session_create(const char *name, int argc, char **argv, const char *path,
 		s->name = NULL;
 		do {
 			s->id = next_session_id++;
-			free (s->name);
+			free(s->name);
 			xasprintf(&s->name, "%u", s->id);
 		} while (RB_FIND(sessions, &sessions, s) != NULL);
 	}
diff --git a/tty-keys.c b/tty-keys.c
index 967decaf..a987c44b 100644
--- a/tty-keys.c
+++ b/tty-keys.c
@@ -382,7 +382,7 @@ tty_keys_build(struct tty *tty)
 	const char				*s;
 
 	if (tty->key_tree != NULL)
-		tty_keys_free (tty);
+		tty_keys_free(tty);
 	tty->key_tree = NULL;
 
 	for (i = 0; i < nitems(tty_default_raw_keys); i++) {
diff --git a/window-choose.c b/window-choose.c
index ef3b8562..db092872 100644
--- a/window-choose.c
+++ b/window-choose.c
@@ -98,7 +98,7 @@ window_choose_add(struct window_pane *wp, struct window_choose_data *wcd)
 	item->pos = ARRAY_LENGTH(&data->list) - 1;
 	item->state = 0;
 
-	data->width = xsnprintf (tmp, sizeof tmp , "%u", item->pos);
+	data->width = xsnprintf(tmp, sizeof tmp , "%u", item->pos);
 }
 
 void
@@ -787,9 +787,9 @@ window_choose_write_line(
 
 		key = window_choose_key_index(data, data->top + py);
 		if (key != -1)
-			xsnprintf (label, sizeof label, "(%c)", key);
+			xsnprintf(label, sizeof label, "(%c)", key);
 		else
-			xsnprintf (label, sizeof label, "(%d)", item->pos);
+			xsnprintf(label, sizeof label, "(%d)", item->pos);
 		screen_write_nputs(ctx, screen_size_x(s) - 1, &gc, utf8flag,
 		    "%*s %s %s", data->width + 2, label,
 		    /*
diff --git a/window-copy.c b/window-copy.c
index 69921f62..b1301676 100644
--- a/window-copy.c
+++ b/window-copy.c
@@ -1585,7 +1585,7 @@ window_copy_copy_line(struct window_pane *wp,
 				s = tty_acs_get(NULL, ud.data[0]);
 				if (s != NULL && strlen(s) <= sizeof ud.data) {
 					ud.size = strlen(s);
-					memcpy (ud.data, s, ud.size);
+					memcpy(ud.data, s, ud.size);
 				}
 			}