diff --git a/archival/dpkg.c b/archival/dpkg.c
index 2180d1868..b7b1ef4a2 100644
--- a/archival/dpkg.c
+++ b/archival/dpkg.c
@@ -317,7 +317,7 @@ static int version_compare(const unsigned int ver1, const unsigned int ver2)
 static int test_version(const unsigned int version1, const unsigned int version2, const unsigned int operator)
 {
 	const int version_result = version_compare(version1, version2);
-	switch(operator) {
+	switch (operator) {
 		case (VER_ANY):
 			return(TRUE);
 		case (VER_EQUAL):
@@ -646,7 +646,7 @@ static unsigned int fill_package_struct(char *control_buffer)
 		}
 
 		field_num = compare_string_array(field_names, field_name);
-		switch(field_num) {
+		switch (field_num) {
 			case 0: /* Package */
 				new_node->name = search_name_hashtable(field_value);
 				break;
diff --git a/archival/libunarchive/data_extract_all.c b/archival/libunarchive/data_extract_all.c
index c8d162bce..b1c66a4a2 100644
--- a/archival/libunarchive/data_extract_all.c
+++ b/archival/libunarchive/data_extract_all.c
@@ -55,7 +55,7 @@ void data_extract_all(archive_handle_t *archive_handle)
 		}
 	} else {
 		/* Create the filesystem entry */
-		switch(file_header->mode & S_IFMT) {
+		switch (file_header->mode & S_IFMT) {
 			case S_IFREG: {
 				/* Regular file */
 				dst_fd = xopen3(file_header->name, O_WRONLY | O_CREAT | O_EXCL,
diff --git a/archival/unzip.c b/archival/unzip.c
index 1b80aea9f..f63925739 100644
--- a/archival/unzip.c
+++ b/archival/unzip.c
@@ -115,9 +115,9 @@ int unzip_main(int argc, char **argv)
 	struct stat stat_buf;
 
 	while((opt = getopt(argc, argv, "-d:lnopqx")) != -1) {
-		switch(opt_range) {
+		switch (opt_range) {
 		case 0: /* Options */
-			switch(opt) {
+			switch (opt) {
 			case 'l': /* List */
 				verbosity = v_list;
 				break;
diff --git a/coreutils/head.c b/coreutils/head.c
index 8dc6ee0b4..50694bfef 100644
--- a/coreutils/head.c
+++ b/coreutils/head.c
@@ -62,7 +62,7 @@ int head_main(int argc, char **argv)
 
 	/* No size benefit in converting this to bb_getopt_ulflags */
 	while ((opt = getopt(argc, argv, head_opts)) > 0) {
-		switch(opt) {
+		switch (opt) {
 #if ENABLE_FEATURE_FANCY_HEAD
 			case 'q':
 				header_threshhold = INT_MAX;
diff --git a/coreutils/sort.c b/coreutils/sort.c
index d86f8dcde..7dfe1764c 100644
--- a/coreutils/sort.c
+++ b/coreutils/sort.c
@@ -293,7 +293,7 @@ int sort_main(int argc, char **argv)
 	}
 #ifdef CONFIG_FEATURE_SORT_BIG
 	/* if no key, perform alphabetic sort */
-    if(!key_list) add_key()->range[0]=1;
+	if(!key_list) add_key()->range[0]=1;
 	/* handle -c */
 	if(global_flags&FLAG_c) {
 		int j=(global_flags&FLAG_u) ? -1 : 0;
diff --git a/miscutils/setsid.c b/miscutils/setsid.c
index 41d9ef2ce..347b2babd 100644
--- a/miscutils/setsid.c
+++ b/miscutils/setsid.c
@@ -25,7 +25,7 @@ int setsid_main(int argc, char *argv[])
 		bb_show_usage();
 
 	if (getpgrp() == getpid()) {
-		switch(fork()){
+		switch (fork()){
 		case -1:
 			bb_perror_msg_and_die("fork");
 		case 0:
diff --git a/networking/libiproute/iproute.c b/networking/libiproute/iproute.c
index c4bbd98b1..6c902eb0e 100644
--- a/networking/libiproute/iproute.c
+++ b/networking/libiproute/iproute.c
@@ -820,7 +820,7 @@ int do_iproute(int argc, char **argv)
 	if (*argv) {
 		command_num = compare_string_array(ip_route_commands, *argv);
 	}
-	switch(command_num) {
+	switch (command_num) {
 		case 0: /* add*/
 			flags = NLM_F_CREATE|NLM_F_EXCL;
 			break;
diff --git a/networking/wget.c b/networking/wget.c
index 0eb8cd610..654973996 100644
--- a/networking/wget.c
+++ b/networking/wget.c
@@ -388,7 +388,7 @@ read_response:
 		s = strchr(target.user, ':');
 		if (s)
 			*(s++) = '\0';
-		switch(ftpcmd("USER ", target.user, sfp, buf)) {
+		switch (ftpcmd("USER ", target.user, sfp, buf)) {
 			case 230:
 				break;
 			case 331: