diff --git a/asc2log.c b/asc2log.c
index cdfeb04..774949c 100644
--- a/asc2log.c
+++ b/asc2log.c
@@ -359,8 +359,7 @@ int get_date(struct timeval *tv, char *date) {
 			   before parsing the real year value (hack) */
 			if (!strptime(date, "%B %d %I:%M:%S.%Y %p %Y", &tms))
 				return 1;
-			else
-				sscanf(date, "%*s %*d %*d:%*d:%*d.%3u ", &msecs);
+			sscanf(date, "%*s %*d %*d:%*d:%*d.%3u ", &msecs);
 		}
 
 	} else {
@@ -377,11 +376,10 @@ int get_date(struct timeval *tv, char *date) {
 			   before parsing the real year value (hack) */
 			if (!strptime(date, "%B %d %H:%M:%S.%Y %Y", &tms))
 				return 1;
-			else
-				sscanf(date, "%*s %*d %*d:%*d:%*d.%3u ", &msecs);
+			sscanf(date, "%*s %*d %*d:%*d:%*d.%3u ", &msecs);
 		}
 	}
-    
+
 	//printf("h %d m %d s %d ms %03d d %d m %d y %d\n",
 	//tms.tm_hour, tms.tm_min, tms.tm_sec, msecs,
 	//tms.tm_mday, tms.tm_mon+1, tms.tm_year+1900);
diff --git a/canfdtest.c b/canfdtest.c
index 1a0f50a..241b3cc 100644
--- a/canfdtest.c
+++ b/canfdtest.c
@@ -181,20 +181,18 @@ static int send_frame(struct can_frame *frame)
 
 	while ((ret = send(sockfd, frame, sizeof(*frame), 0))
 	       != sizeof(*frame)) {
-		if (ret < 0) {
-			if (errno != ENOBUFS) {
-				perror("send failed");
-				return -1;
-			} else {
-				if (verbose) {
-					printf("N");
-					fflush(stdout);
-				}
-			}
-		} else {
+		if (ret >= 0) {
 			fprintf(stderr, "send returned %d", ret);
 			return -1;
 		}
+		if (errno != ENOBUFS) {
+			perror("send failed");
+			return -1;
+		}
+		if (verbose) {
+			printf("N");
+			fflush(stdout);
+		}
 	}
 	return 0;
 }
@@ -332,19 +330,19 @@ static int can_echo_gen(void)
 				if (recv_tx_pos == inflight_count)
 					recv_tx_pos = 0;
 				continue;
-			} else {
-				if (!recv_tx[recv_rx_pos]) {
-					printf("RX before TX!\n");
-					print_frame(&rx_frame, 0);
-					running = 0;
-				}
-				/* compare with expected */
-				compare_frame(&tx_frames[recv_rx_pos], &rx_frame, 1);
-				recv_rx_pos++;
-				if (recv_rx_pos == inflight_count)
-					recv_rx_pos = 0;
 			}
 
+			if (!recv_tx[recv_rx_pos]) {
+				printf("RX before TX!\n");
+				print_frame(&rx_frame, 0);
+				running = 0;
+			}
+			/* compare with expected */
+			compare_frame(&tx_frames[recv_rx_pos], &rx_frame, 1);
+			recv_rx_pos++;
+			if (recv_rx_pos == inflight_count)
+				recv_rx_pos = 0;
+
 			loops++;
 			if (test_loops && loops >= test_loops)
 				break;
diff --git a/cangen.c b/cangen.c
index e26c08b..7d0e82c 100644
--- a/cangen.c
+++ b/cangen.c
@@ -468,8 +468,8 @@ resend:
 				if (poll(&fds, 1, polltimeout) < 0) {
 					perror("poll");
 					return 1;
-				} else
-					goto resend;
+				}
+				goto resend;
 			} else
 				enobufs_count++;
 
diff --git a/canlogserver.c b/canlogserver.c
index ef338d1..8b61ac4 100644
--- a/canlogserver.c
+++ b/canlogserver.c
@@ -300,15 +300,14 @@ int main(int argc, char **argv)
 			//printf("accepted\n");
 			if (!fork())
 				break;
-			else
-				close(accsocket);
+			close(accsocket);
 		}
 		else if (errno != EINTR) {
 			perror("accept");
 			exit(1);
 		}
 	}
-  
+
 	for (i=0; i<currmax; i++) {
 
 #ifdef DEBUG
diff --git a/isotpdump.c b/isotpdump.c
index fa2129b..c18dc5a 100644
--- a/isotpdump.c
+++ b/isotpdump.c
@@ -335,65 +335,66 @@ int main(int argc, char **argv)
 		if (nbytes < 0) {
 			perror("read");
 			return 1;
-		} else if (nbytes != CAN_MTU && nbytes != CANFD_MTU) {
+		}
+		if (nbytes != CAN_MTU && nbytes != CANFD_MTU) {
 			fprintf(stderr, "read: incomplete CAN frame %zu %d\n", sizeof(frame), nbytes);
 			return 1;
-		} else {
+		}
+		if (frame.can_id == src && ext && !extany &&
+		    extaddr != frame.data[0])
+			continue;
 
-			if (frame.can_id == src && ext && !extany && extaddr != frame.data[0])
-				continue;
+		if (frame.can_id == dst && rx_ext && !rx_extany &&
+		    rx_extaddr != frame.data[0])
+			continue;
 
-			if (frame.can_id == dst && rx_ext && !rx_extany && rx_extaddr != frame.data[0])
-				continue;
+		if (color)
+			printf("%s", (frame.can_id == src) ? FGRED : FGBLUE);
 
-			if (color)
-				printf("%s", (frame.can_id == src)? FGRED:FGBLUE);
+		if (timestamp) {
+			ioctl(s, SIOCGSTAMP, &tv);
 
-			if (timestamp) {
-				ioctl(s, SIOCGSTAMP, &tv);
-
-
-				switch (timestamp) {
-
-				case 'a': /* absolute with timestamp */
-					printf("(%lu.%06lu) ", tv.tv_sec, tv.tv_usec);
-					break;
-
-				case 'A': /* absolute with date */
-				{
-					struct tm tm;
-					char timestring[25];
-
-					tm = *localtime(&tv.tv_sec);
-					strftime(timestring, 24, "%Y-%m-%d %H:%M:%S", &tm);
-					printf("(%s.%06lu) ", timestring, tv.tv_usec);
-				}
+			switch (timestamp) {
+			case 'a': /* absolute with timestamp */
+				printf("(%lu.%06lu) ", tv.tv_sec, tv.tv_usec);
 				break;
 
-				case 'd': /* delta */
-				case 'z': /* starting with zero */
-				{
-					struct timeval diff;
+			case 'A': /* absolute with date */
+			{
+				struct tm tm;
+				char timestring[25];
 
-					if (last_tv.tv_sec == 0)   /* first init */
-						last_tv = tv;
-					diff.tv_sec  = tv.tv_sec  - last_tv.tv_sec;
-					diff.tv_usec = tv.tv_usec - last_tv.tv_usec;
-					if (diff.tv_usec < 0)
-						diff.tv_sec--, diff.tv_usec += 1000000;
-					if (diff.tv_sec < 0)
-						diff.tv_sec = diff.tv_usec = 0;
-					printf("(%lu.%06lu) ", diff.tv_sec, diff.tv_usec);
+				tm = *localtime(&tv.tv_sec);
+				strftime(timestring, 24, "%Y-%m-%d %H:%M:%S",
+					 &tm);
+				printf("(%s.%06lu) ", timestring, tv.tv_usec);
+			} break;
 
-					if (timestamp == 'd')
-						last_tv = tv; /* update for delta calculation */
-				}
+			case 'd': /* delta */
+			case 'z': /* starting with zero */
+			{
+				struct timeval diff;
+
+				if (last_tv.tv_sec == 0) /* first init */
+					last_tv = tv;
+				diff.tv_sec = tv.tv_sec - last_tv.tv_sec;
+				diff.tv_usec = tv.tv_usec - last_tv.tv_usec;
+				if (diff.tv_usec < 0)
+					diff.tv_sec--, diff.tv_usec += 1000000;
+				if (diff.tv_sec < 0)
+					diff.tv_sec = diff.tv_usec = 0;
+				printf("(%lu.%06lu) ", diff.tv_sec,
+				       diff.tv_usec);
+
+				if (timestamp == 'd')
+					last_tv =
+						tv; /* update for delta calculation */
+			} break;
+
+			default: /* no timestamp output */
 				break;
-
-				default: /* no timestamp output */
-					break;
-				}
 			}
+		}
 
 			if (frame.can_id & CAN_EFF_FLAG)
 				printf(" %s  %8X", argv[optind], frame.can_id & CAN_EFF_MASK);
@@ -410,7 +411,7 @@ int main(int argc, char **argv)
 
 			datidx = 0;
 			n_pci = frame.data[ext];
-	    
+
 			switch (n_pci & 0xF0) {
 			case 0x00:
 			        is_ff = 1;
@@ -501,7 +502,6 @@ int main(int argc, char **argv)
 				printf("%s", ATTRESET);
 			printf("\n");
 			fflush(stdout);
-		}
 	}
 
 	close(s);
diff --git a/isotpperf.c b/isotpperf.c
index f0ad808..19fb4e6 100644
--- a/isotpperf.c
+++ b/isotpperf.c
@@ -223,19 +223,21 @@ int main(int argc, char **argv)
 			ret = nbytes;
 			running = 0;
 			continue;
-		} else if (nbytes != CAN_MTU && nbytes != CANFD_MTU) {
+		}
+		if (nbytes != CAN_MTU && nbytes != CANFD_MTU) {
 			fprintf(stderr, "read: incomplete CAN frame %zu %d\n", sizeof(frame), nbytes);
 			ret = nbytes;
 			running = 0;
 			continue;
-		} else {
-			if (rcvlen) {
-				/* make sure to process only the detected PDU CAN frame type */
-				if (canfd_on && (nbytes != CANFD_MTU))
-					continue;
-				if (!canfd_on && (nbytes != CAN_MTU))
-					continue;
-			}
+		}
+
+		if (rcvlen) {
+			/* make sure to process only the detected PDU CAN frame type */
+			if (canfd_on && (nbytes != CANFD_MTU))
+				continue;
+			if (!canfd_on && (nbytes != CAN_MTU))
+				continue;
+		}
 
 			/* check extended address if provided */
 			if (ext && extaddr != frame.data[0])
@@ -255,7 +257,7 @@ int main(int argc, char **argv)
 				} else
 					continue;
 			}
-			
+
 			/* data content starts and index datidx */
 			datidx = 0;
 
@@ -355,7 +357,7 @@ int main(int argc, char **argv)
 			if (rcvlen) {
 				if (rcvlen > fflen)
 					rcvlen = fflen;
-				
+
 				percent = (rcvlen * 100 / fflen);
 				printf("\r %3lu%% ", percent);
 
@@ -408,7 +410,6 @@ int main(int argc, char **argv)
 				fflen = rcvlen = 0;
 			}
 			fflush(stdout);
-		}
 	}
 
 	close(s);
diff --git a/j1939acd.c b/j1939acd.c
index 35257fa..b11c6c4 100644
--- a/j1939acd.c
+++ b/j1939acd.c
@@ -383,10 +383,9 @@ static inline int addr_status_mine(int sa)
 {
 	if (sa == s.current_sa)
 		return '*';
-	else if (addr[sa].flags & F_USE)
+	if (addr[sa].flags & F_USE)
 		return '+';
-	else
-		return '-';
+	return '-';
 }
 
 static void dump_status(void)
diff --git a/j1939cat.c b/j1939cat.c
index 81ffe04..c3a59b9 100644
--- a/j1939cat.c
+++ b/j1939cat.c
@@ -212,8 +212,7 @@ static int j1939cat_extract_serr(struct j1939cat_priv *priv)
 
 		if (serr->ee_info == SCM_TSTAMP_SCHED)
 			return -EINTR;
-		else
-			return 0;
+		return 0;
 	case SO_EE_ORIGIN_LOCAL:
 		/*
 		 * The serr->ee_origin == SO_EE_ORIGIN_LOCAL is
@@ -319,11 +318,10 @@ static int j1939cat_send_loop(struct j1939cat_priv *priv, int out_fd, char *buf,
 			ret = poll(&fds, 1, priv->polltimeout);
 			if (ret == -EINTR)
 				continue;
-			else if (ret < 0)
+			if (ret < 0)
 				return -errno;
-			else if (!ret)
+			if (!ret)
 				return -ETIME;
-
 			if (!(fds.revents & events)) {
 				warn("%s: something else is wrong", __func__);
 				return -EIO;
@@ -333,11 +331,10 @@ static int j1939cat_send_loop(struct j1939cat_priv *priv, int out_fd, char *buf,
 				ret = j1939cat_recv_err(priv);
 				if (ret == -EINTR)
 					continue;
-				else if (ret)
+				if (ret)
 					return ret;
-				else if ((priv->repeat - 1) == stats->tskey)
+				if ((priv->repeat - 1) == stats->tskey)
 					tx_done = true;
-
 			}
 
 			if (fds.revents & POLLOUT) {
diff --git a/lib.c b/lib.c
index 097b2e8..4a9251f 100644
--- a/lib.c
+++ b/lib.c
@@ -588,7 +588,7 @@ void snprintf_can_error_frame(char *buf, size_t len, const struct canfd_frame *c
 		if (class & mask) {
 			if (classes)
 				n += snprintf(buf + n, len - n, "%s", sep);
- 			n += snprintf(buf + n, len - n, "%s", error_classes[i]);
+			n += snprintf(buf + n, len - n, "%s", error_classes[i]);
 			if (mask == CAN_ERR_LOSTARB)
 				n += snprintf_error_lostarb(buf + n, len - n,
 							   cf);
diff --git a/libj1939.c b/libj1939.c
index 08e4fd7..072162d 100644
--- a/libj1939.c
+++ b/libj1939.c
@@ -64,8 +64,8 @@ static const char *libj1939_ifnam(int ifindex)
 		 */
 		libj1939_cleanup();
 		return libj1939_ifnam(ifindex);
-	} else
-		return NULL;
+	}
+	return NULL;
 }
 
 /* retrieve index */
@@ -88,8 +88,8 @@ static int libj1939_ifindex(const char *str)
 	if (cached) {
 		libj1939_cleanup();
 		return libj1939_ifindex(str);
-	} else
-		return 0;
+	}
+	return 0;
 }
 
 void libj1939_parse_canaddr(char *spec, struct sockaddr_can *paddr)