diff --git a/editors/vi.c b/editors/vi.c
index 853303249..c7582bfe0 100644
--- a/editors/vi.c
+++ b/editors/vi.c
@@ -3393,7 +3393,7 @@ static void do_cmd(char c)
 					editing = 0;
 				}
 			}
-		} else if (strncasecmp(p, "file", cnt) == 0 ) {
+		} else if (strncasecmp(p, "file", cnt) == 0) {
 			last_status_cksum = 0;	// force status update
 		} else if (sscanf(p, "%d", &j) > 0) {
 			dot = find_line(j);		// go to line # j
diff --git a/init/init.c b/init/init.c
index 02a33274a..8c32b7791 100644
--- a/init/init.c
+++ b/init/init.c
@@ -880,8 +880,7 @@ static void reload_signal(int sig ATTRIBUTE_UNUSED)
 	/* remove unused entrys */
 	for (a = init_action_list; a; a = tmp) {
 		tmp = a->next;
-		if (a->action & (ONCE | SYSINIT | WAIT ) &&
-				a->pid == 0 ) {
+		if ((a->action & (ONCE | SYSINIT | WAIT)) && a->pid == 0) {
 			delete_init_action(a);
 		}
 	}
diff --git a/libbb/bb_pwd.c b/libbb/bb_pwd.c
index 223a6b44c..3af1994d5 100644
--- a/libbb/bb_pwd.c
+++ b/libbb/bb_pwd.c
@@ -28,7 +28,7 @@
 /* internal function for bb_getpwuid and bb_getgrgid */
 static char* bb_getug(char *buffer, char *idname, long id, int bufsize, char prefix)
 {
-	if (bufsize > 0 ) {
+	if (bufsize > 0) {
 		assert(buffer != NULL);
 		if (idname) {
 			return safe_strncpy(buffer, idname, bufsize);
diff --git a/libbb/human_readable.c b/libbb/human_readable.c
index ff1b55141..7469e7999 100644
--- a/libbb/human_readable.c
+++ b/libbb/human_readable.c
@@ -72,8 +72,8 @@ const char *make_human_readable_str(unsigned long long size,
 		}
 #if 0
 		/* Sample code to omit decimal point and tenths digit. */
-		if ( /* no_tenths */ 1 ) {
-			if ( frac >= 5 ) {
+		if (/* no_tenths */ 1) {
+			if (frac >= 5) {
 				++val;
 			}
 			f = "%llu%*c" /* fmt_no_tenths */ ;
diff --git a/networking/telnet.c b/networking/telnet.c
index cd88a9b3d..5c75a7409 100644
--- a/networking/telnet.c
+++ b/networking/telnet.c
@@ -188,7 +188,7 @@ static void handlenetoutput(int len)
 		else if (*p == 0x0d)
 			outbuf[j++] = 0x00;
 	}
-	if (j > 0 )
+	if (j > 0)
 		write(G.netfd, outbuf, j);
 }
 
diff --git a/networking/udhcp/arpping.c b/networking/udhcp/arpping.c
index f78fd3fd8..615a91172 100644
--- a/networking/udhcp/arpping.c
+++ b/networking/udhcp/arpping.c
@@ -94,9 +94,11 @@ int arpping(uint32_t yiaddr, uint32_t ip, uint8_t *mac, char *interface)
 		tm.tv_sec = timeout;
 		if (select(s + 1, &fdset, (fd_set *) NULL, (fd_set *) NULL, &tm) < 0) {
 			bb_perror_msg("error on ARPING request");
-			if (errno != EINTR) rv = 0;
+			if (errno != EINTR)
+				rv = 0;
 		} else if (FD_ISSET(s, &fdset)) {
-			if (recv(s, &arp, sizeof(arp), 0) < 0 ) rv = 0;
+			if (recv(s, &arp, sizeof(arp), 0) < 0)
+				rv = 0;
 			if (arp.operation == htons(ARPOP_REPLY) &&
 			    memcmp(arp.tHaddr, mac, 6) == 0 &&
 			    *((uint32_t *) arp.sInaddr) == yiaddr) {
diff --git a/procps/free.c b/procps/free.c
index 860f57347..2b205d0c7 100644
--- a/procps/free.c
+++ b/procps/free.c
@@ -18,10 +18,10 @@ int free_main(int argc, char **argv)
 	sysinfo(&info);
 
 	/* Kernels prior to 2.4.x will return info.mem_unit==0, so cope... */
-	if (info.mem_unit==0) {
+	if (info.mem_unit == 0) {
 		info.mem_unit=1;
 	}
-	if ( info.mem_unit == 1 ) {
+	if (info.mem_unit == 1) {
 		info.mem_unit=1024;
 
 		/* TODO:  Make all this stuff not overflow when mem >= 4 Gib */
@@ -46,7 +46,7 @@ int free_main(int argc, char **argv)
 		info.bufferram*=info.mem_unit;
 	}
 
-	if (argc > 1 && **(argv + 1) == '-')
+	if (argc > 1 && *argv[1] == '-')
 		bb_show_usage();
 
 	printf("%6s%13s%13s%13s%13s%13s\n", "", "total", "used", "free",
@@ -66,4 +66,3 @@ int free_main(int argc, char **argv)
 #endif
 	return EXIT_SUCCESS;
 }
-
diff --git a/shell/hush.c b/shell/hush.c
index 7658aebed..5bc83bc41 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -1095,7 +1095,7 @@ static void pseudo_exec(struct child_prog *child)
 		 * if this is one of those cases.
 		 */
 		for (x = bltins; x->cmd; x++) {
-			if (strcmp(child->argv[0], x->cmd) == 0 ) {
+			if (strcmp(child->argv[0], x->cmd) == 0) {
 				debug_printf("builtin exec %s\n", child->argv[0]);
 				rcode = x->function(child);
 				fflush(stdout);
@@ -1369,7 +1369,7 @@ static int run_pipe_real(struct pipe *pi)
 			return last_return_code;
 		}
 		for (x = bltins; x->cmd; x++) {
-			if (strcmp(child->argv[i], x->cmd) == 0 ) {
+			if (strcmp(child->argv[i], x->cmd) == 0) {
 				int squirrel[] = { -1, -1, -1 };
 				int rcode;
 				if (x->function == builtin_exec && child->argv[i+1] == NULL) {
diff --git a/shell/lash.c b/shell/lash.c
index 09067fda0..f938a74b9 100644
--- a/shell/lash.c
+++ b/shell/lash.c
@@ -1138,7 +1138,7 @@ static int pseudo_exec(struct child_prog *child)
 	 * if this is one of those cases.
 	 */
 	for (x = bltins; x->cmd; x++) {
-		if (strcmp(child->argv[0], x->cmd) == 0 ) {
+		if (strcmp(child->argv[0], x->cmd) == 0) {
 			_exit(x->function(child));
 		}
 	}
@@ -1262,7 +1262,7 @@ static int run_command(struct job *newjob, int inbg, int outpipe[2])
 			}
 
 			for (x = bltins; x->cmd; x++) {
-				if (strcmp(child->argv[0], x->cmd) == 0 ) {
+				if (strcmp(child->argv[0], x->cmd) == 0) {
 					int rcode;
 					int squirrel[] = {-1, -1, -1};
 					setup_redirects(child, squirrel);
diff --git a/util-linux/fdisk_sgi.c b/util-linux/fdisk_sgi.c
index b2e0d7a62..b7e09f3c2 100644
--- a/util-linux/fdisk_sgi.c
+++ b/util-linux/fdisk_sgi.c
@@ -613,7 +613,7 @@ sgi_gaps(void)
 static void
 sgi_change_sysid(int i, int sys)
 {
-	if (sgi_get_num_sectors(i) == 0 ) { /* caught already before, ... */
+	if (sgi_get_num_sectors(i) == 0) { /* caught already before, ... */
 		printf("Sorry you may change the Tag of non-empty partitions\n");
 		return;
 	}
diff --git a/util-linux/hwclock.c b/util-linux/hwclock.c
index 86235e989..4ca8eafad 100644
--- a/util-linux/hwclock.c
+++ b/util-linux/hwclock.c
@@ -61,7 +61,7 @@ static time_t read_rtc(int utc)
 	int rtc = xopen_rtc(O_RDONLY);
 
 	memset(&tm, 0, sizeof(struct tm));
-	if (ioctl(rtc, RTC_RD_TIME, &tm) < 0 )
+	if (ioctl(rtc, RTC_RD_TIME, &tm) < 0)
 		bb_perror_msg_and_die("cannot read time from RTC");
 	tm.tm_isdst = -1; /* not known */
 
@@ -165,7 +165,7 @@ static int check_utc(void)
 
 			buffer[len] = 0;
 
-			if (strncmp(buffer, "UTC", 3) == 0 ) {
+			if (strncmp(buffer, "UTC", 3) == 0) {
 				utc = 1;
 				break;
 			}