diff --git a/include/villas/nodes/ethercat_config.hpp b/include/villas/nodes/ethercat_config.hpp
index 6bce8804f..3922da789 100644
--- a/include/villas/nodes/ethercat_config.hpp
+++ b/include/villas/nodes/ethercat_config.hpp
@@ -42,7 +42,7 @@
 #define ETHERCAT_PID_FC1100 0x044c0c62
 
 
-/** @todo: Make PDO entry tables configurable */
+/** @todo Make PDO entry tables configurable */
 
 /* Master 0, Slave 3, "EL4038"
  * Vendor ID:       0x00000002
diff --git a/lib/formats/raw.cpp b/lib/formats/raw.cpp
index 857dd265e..f5fa82cb9 100644
--- a/lib/formats/raw.cpp
+++ b/lib/formats/raw.cpp
@@ -28,7 +28,7 @@
 
 typedef float flt32_t;
 typedef double flt64_t;
-typedef long double flt128_t; /** @todo: check */
+typedef long double flt128_t; /** @todo check */
 
 using namespace villas;
 using namespace villas::node;
diff --git a/lib/nodes/comedi.cpp b/lib/nodes/comedi.cpp
index 6cdcd0236..865521c0a 100644
--- a/lib/nodes/comedi.cpp
+++ b/lib/nodes/comedi.cpp
@@ -324,7 +324,7 @@ static int comedi_start_out(struct vnode *n)
 	d->last_debug = time_now();
 
 	/* Allocate buffer for one complete VILLAS sample */
-	/** @todo: maybe increase buffer size according to c->vectorize */
+	/** @todo maybe increase buffer size according to c->vectorize */
 	const size_t local_buffer_size = d->sample_size * d->chanlist_len;
 	d->buffer = new char[local_buffer_size];
 	d->bufptr = d->buffer;
@@ -455,7 +455,7 @@ int comedi_start(struct vnode *n)
 		throw RuntimeError("Failed to open device: {}", comedi_strerror(comedi_errno()));
 
 	/* Enable non-blocking syscalls */
-	/** @todo: verify if this works with both input and output, so comment out */
+	/** @todo verify if this works with both input and output, so comment out */
 	//if (fcntl(comedi_fileno(c->dev), F_SETFL, O_NONBLOCK))
 	//	throw RuntimeError("Failed to set non-blocking flag in Comedi FD");
 
@@ -602,7 +602,7 @@ int comedi_read(struct vnode *n, struct sample * const smps[], unsigned cnt)
 			const size_t bytes_left = bytes_available - bytes_consumed;
 			if (bytes_left > 0) {
 				/* Move leftover bytes to the beginning of buffer */
-				/** @todo: optimize? */
+				/** @todo optimize? */
 				memmove(c->buf, c->bufptr, bytes_left);
 			}
 
diff --git a/lib/nodes/exec.cpp b/lib/nodes/exec.cpp
index 9ec7c602d..d1d3d48a7 100644
--- a/lib/nodes/exec.cpp
+++ b/lib/nodes/exec.cpp
@@ -173,7 +173,7 @@ int exec_stop(struct vnode *n)
 	n->logger->debug("Waiting for sub-process with pid={} to terminate", e->proc->getPid());
 	e->proc->close();
 
-	/** @todo: Check exit code of subprocess? */
+	/** @todo Check exit code of subprocess? */
 	return 0;
 }
 
diff --git a/lib/nodes/opal.cpp b/lib/nodes/opal.cpp
index 69638a40a..59c4ef747 100644
--- a/lib/nodes/opal.cpp
+++ b/lib/nodes/opal.cpp
@@ -108,7 +108,7 @@ int opal_type_start(villas::node::SuperNode *sn)
 {
 	int err, noRecvIcons, noSendIcons;
 
-	/* @todo: Port to C++
+	/* @todo Port to C++
 	if (sn->cli.argc != 4)
 		return -1; */
 
@@ -221,7 +221,7 @@ char * opal_print(struct vnode *n)
 {
 	struct opal *o = (struct opal *) n->_vd;
 
-	/** @todo: Print send_params, recv_params */
+	/** @todo Print send_params, recv_params */
 
 	return strf("sendID=%u, recvID=%u, reply=%u",
 		o->sendID, o->recvID, o->reply);
diff --git a/lib/nodes/shmem.cpp b/lib/nodes/shmem.cpp
index dd0b75f61..1853fae95 100644
--- a/lib/nodes/shmem.cpp
+++ b/lib/nodes/shmem.cpp
@@ -154,7 +154,7 @@ int shmem_read(struct vnode *n, struct sample * const smps[], unsigned cnt)
 	sample_copy_many(smps, shared_smps, recv);
 	sample_decref_many(shared_smps, recv);
 
-	/** @todo: signal descriptions are currently not shared between processes */
+	/** @todo signal descriptions are currently not shared between processes */
 	for (int i = 0; i < recv; i++)
 		smps[i]->signals = &n->in.signals;
 
diff --git a/lib/nodes/uldaq.cpp b/lib/nodes/uldaq.cpp
index 1ae2d8f8b..d7ce8dd03 100644
--- a/lib/nodes/uldaq.cpp
+++ b/lib/nodes/uldaq.cpp
@@ -558,7 +558,7 @@ int uldaq_stop(struct vnode *n)
 
 	UlError err;
 
-	/* @todo: Fix deadlock */
+	/* @todo Fix deadlock */
 	//pthread_mutex_lock(&u->in.mutex);
 
 	/* Get the current status of the acquisition */
diff --git a/lib/socket_addr.cpp b/lib/socket_addr.cpp
index 3794e53ce..c1e9b7930 100644
--- a/lib/socket_addr.cpp
+++ b/lib/socket_addr.cpp
@@ -94,7 +94,7 @@ char * socket_print_addr(struct sockaddr *saddr)
 
 int socket_parse_address(const char *addr, struct sockaddr *saddr, enum SocketLayer layer, int flags)
 {
-	/** @todo: Add support for IPv6 */
+	/** @todo Add support for IPv6 */
 	union sockaddr_union *sa = (union sockaddr_union *) saddr;
 
 	char *copy = strdup(addr);
diff --git a/lib/web.cpp b/lib/web.cpp
index 3ea70de9f..81a7b95d5 100644
--- a/lib/web.cpp
+++ b/lib/web.cpp
@@ -185,7 +185,7 @@ Web::Web(Api *a) :
 	htdocs(WEB_PATH),
 	api(a)
 {
-	/** @todo: Port to C++: add LLL_DEBUG and others if trace log level is activated */
+	/** @todo Port to C++: add LLL_DEBUG and others if trace log level is activated */
 	lws_set_log_level(LLL_ERR | LLL_WARN | LLL_NOTICE, lwsLogger);
 }
 
diff --git a/tests/unit/format.cpp b/tests/unit/format.cpp
index d50b001aa..840bb0db4 100644
--- a/tests/unit/format.cpp
+++ b/tests/unit/format.cpp
@@ -83,7 +83,7 @@ void fill_sample_data(struct vlist *signals, struct sample *smps[], unsigned cnt
 					break;
 
 				case SignalType::COMPLEX: {
-					/** @todo: Port to proper C++ */
+					/** @todo Port to proper C++ */
 					std::complex<float> z = { j * 0.1f, i * 100.0f };
 					memcpy(&data->z, &z, sizeof(data->z));
 					break;