diff --git a/src/villas-convert.cpp b/src/villas-convert.cpp
index 455f72fab..e2c09322c 100644
--- a/src/villas-convert.cpp
+++ b/src/villas-convert.cpp
@@ -51,6 +51,7 @@ int main(int argc, char *argv[])
 	const char *output_format = "villas.human";
 
 	char c, *endptr;
+	/* Parse optional command line arguments */
 	while ((c = getopt(argc, argv, "Vhd:i:o:")) != -1) {
 		switch (c) {
 			case 'V':
diff --git a/src/villas-hook.cpp b/src/villas-hook.cpp
index 8cca55003..5866fa71d 100644
--- a/src/villas-hook.cpp
+++ b/src/villas-hook.cpp
@@ -122,6 +122,7 @@ int main(int argc, char *argv[])
 	json_t *cfg_cli = json_object();
 
 	char c, *endptr;
+	/* Parse optional command line arguments */
 	while ((c = getopt(argc, argv, "Vhv:d:f:o:")) != -1) {
 		switch (c) {
 			case 'V':
diff --git a/src/villas-node.cpp b/src/villas-node.cpp
index 3a1f8a7f0..c78105167 100644
--- a/src/villas-node.cpp
+++ b/src/villas-node.cpp
@@ -117,6 +117,8 @@ int main(int argc, char *argv[])
 
 	const char *uri = "opal-shmem.conf";
 #else
+
+	/* Parse optional command line arguments */
 	int c;
 	while ((c = getopt(argc, argv, "hV")) != -1) {
 		switch (c) {
diff --git a/src/villas-pipe.cpp b/src/villas-pipe.cpp
index 39733ba19..85b308e65 100644
--- a/src/villas-pipe.cpp
+++ b/src/villas-pipe.cpp
@@ -255,6 +255,7 @@ int main(int argc, char *argv[])
 
 	json_t *cfg_cli = json_object();
 
+	/* Parse optional command line arguments */
 	int c;
 	char *endptr;
 	while ((c = getopt(argc, argv, "Vhxrsd:l:L:t:f:o:")) != -1) {