diff --git a/src/villas-convert.cpp b/src/villas-convert.cpp
index e7b2f45d0..f6270ad90 100644
--- a/src/villas-convert.cpp
+++ b/src/villas-convert.cpp
@@ -57,12 +57,15 @@ int main(int argc, char *argv[])
 			case 'V':
 				print_version();
 				exit(EXIT_SUCCESS);
+
 			case 'i':
 				input_format = optarg;
 				break;
+
 			case 'o':
 				output_format = optarg;
 				break;
+
 			case 'd':
 				level = strtoul(optarg, &endptr, 10);
 				goto check;
diff --git a/src/villas-node.cpp b/src/villas-node.cpp
index ff48104d2..51d647c88 100644
--- a/src/villas-node.cpp
+++ b/src/villas-node.cpp
@@ -117,6 +117,7 @@ int main(int argc, char *argv[])
 			case 'V':
 				print_version();
 				exit(EXIT_SUCCESS);
+
 			case 'h':
 			case '?':
 				usage();
diff --git a/src/villas-pipe.cpp b/src/villas-pipe.cpp
index a987ce1f2..f3a1fd00a 100644
--- a/src/villas-pipe.cpp
+++ b/src/villas-pipe.cpp
@@ -259,27 +259,35 @@ int main(int argc, char *argv[])
 			case 'V':
 				print_version();
 				exit(EXIT_SUCCESS);
+
 			case 'f':
 				format = optarg;
 				break;
+
 			case 'x':
 				reverse = true;
 				break;
+
 			case 's':
 				recvv.enabled = false; // send only
 				break;
+
 			case 'r':
 				sendd.enabled = false; // receive only
 				break;
+
 			case 'l':
 				recvv.limit = strtoul(optarg, &endptr, 10);
 				goto check;
+
 			case 'L':
 				sendd.limit = strtoul(optarg, &endptr, 10);
 				goto check;
+
 			case 't':
 				timeout = strtoul(optarg, &endptr, 10);
 				goto check;
+
 			case 'o':
 				ret = json_object_extend_str(cfg_cli, optarg);
 				if (ret)
diff --git a/src/villas-test-cmp.cpp b/src/villas-test-cmp.cpp
index e160cd60a..5e4dad748 100644
--- a/src/villas-test-cmp.cpp
+++ b/src/villas-test-cmp.cpp
@@ -86,18 +86,23 @@ int main(int argc, char *argv[])
 			case 'e':
 				epsilon = strtod(optarg, &endptr);
 				goto check;
+
 			case 'v':
 				flags &= ~SAMPLE_HAS_DATA;
 				break;
+
 			case 't':
 				flags &= ~SAMPLE_HAS_TS_ORIGIN;
 				break;
+
 			case 's':
 				flags &= ~SAMPLE_HAS_SEQUENCE;
 				break;
+
 			case 'f':
 				format = optarg;
 				break;
+
 			case 'V':
 				print_version();
 				exit(EXIT_SUCCESS);
diff --git a/src/villas-test-rtt.cpp b/src/villas-test-rtt.cpp
index f7e4c68f2..f7e6bde30 100644
--- a/src/villas-test-rtt.cpp
+++ b/src/villas-test-rtt.cpp
@@ -96,15 +96,19 @@ int main(int argc, char *argv[])
 			case 'c':
 				count = strtoul(optarg, &endptr, 10);
 				goto check;
+
 			case 'f':
 				fd = strtoul(optarg, &endptr, 10);
 				goto check;
+
 			case 'w':
 				hist_warmup = strtoul(optarg, &endptr, 10);
 				goto check;
+
 			case 'b':
 				hist_buckets = strtoul(optarg, &endptr, 10);
 				goto check;
+
 			case 'V':
 				print_version();
 				exit(EXIT_SUCCESS);