From 78727be952dc5898765f7bfe1e19e2324d041618 Mon Sep 17 00:00:00 2001
From: Steffen Vogel <steffen.vogel@opal-rt.com>
Date: Mon, 28 Aug 2023 09:34:02 +0200
Subject: [PATCH] Use C++ style comments

Signed-off-by: Steffen Vogel <steffen.vogel@opal-rt.com>
---
 clients/shmem/villas-shmem.cpp                    | 6 +++---
 include/villas/api.hpp                            | 6 +++---
 include/villas/api/request.hpp                    | 6 +++---
 include/villas/api/requests/node.hpp              | 6 +++---
 include/villas/api/requests/path.hpp              | 6 +++---
 include/villas/api/requests/universal.hpp         | 6 +++---
 include/villas/api/response.hpp                   | 6 +++---
 include/villas/api/session.hpp                    | 6 +++---
 include/villas/api/universal.hpp                  | 8 ++++----
 include/villas/capabilities.hpp                   | 2 +-
 include/villas/config_class.hpp                   | 4 ++--
 include/villas/config_helper.hpp                  | 4 ++--
 include/villas/dumper.hpp                         | 4 ++--
 include/villas/format.hpp                         | 4 ++--
 include/villas/formats/column.hpp                 | 4 ++--
 include/villas/formats/iotagent_ul.hpp            | 4 ++--
 include/villas/formats/json.hpp                   | 4 ++--
 include/villas/formats/json_edgeflex.hpp          | 4 ++--
 include/villas/formats/json_kafka.hpp             | 4 ++--
 include/villas/formats/json_reserve.hpp           | 4 ++--
 include/villas/formats/line.hpp                   | 4 ++--
 include/villas/formats/msg.hpp                    | 4 ++--
 include/villas/formats/msg_format.hpp             | 4 ++--
 include/villas/formats/opal_asyncip.hpp           | 4 ++--
 include/villas/formats/protobuf.hpp               | 4 ++--
 include/villas/formats/raw.hpp                    | 4 ++--
 include/villas/formats/value.hpp                  | 4 ++--
 include/villas/formats/villas_binary.hpp          | 4 ++--
 include/villas/formats/villas_human.hpp           | 4 ++--
 include/villas/hook.hpp                           | 4 ++--
 include/villas/hook_list.hpp                      | 4 ++--
 include/villas/hooks/decimate.hpp                 | 4 ++--
 include/villas/hooks/limit_rate.hpp               | 4 ++--
 include/villas/hooks/lua.hpp                      | 4 ++--
 include/villas/hooks/pmu.hpp                      | 4 ++--
 include/villas/kernel/if.hpp                      | 4 ++--
 include/villas/kernel/nl.hpp                      | 6 +++---
 include/villas/kernel/tc.hpp                      | 6 +++---
 include/villas/kernel/tc_netem.hpp                | 6 +++---
 include/villas/log_opal_sink.hpp                  | 4 ++--
 include/villas/mapping.hpp                        | 4 ++--
 include/villas/mapping_list.hpp                   | 4 ++--
 include/villas/memory/ib.h                        | 6 +++---
 include/villas/node.hpp                           | 4 ++--
 include/villas/node/exceptions.hpp                | 4 ++--
 include/villas/node/memory.hpp                    | 6 +++---
 include/villas/node/memory_type.hpp               | 6 +++---
 include/villas/node_compat.hpp                    | 4 ++--
 include/villas/node_compat_type.hpp               | 4 ++--
 include/villas/node_direction.hpp                 | 4 ++--
 include/villas/node_list.hpp                      | 4 ++--
 include/villas/nodes/amqp.hpp                     | 4 ++--
 include/villas/nodes/api.hpp                      | 4 ++--
 include/villas/nodes/can.hpp                      | 4 ++--
 include/villas/nodes/comedi.hpp                   | 4 ++--
 include/villas/nodes/ethercat.hpp                 | 4 ++--
 include/villas/nodes/example.hpp                  | 4 ++--
 include/villas/nodes/exec.hpp                     | 4 ++--
 include/villas/nodes/file.hpp                     | 4 ++--
 include/villas/nodes/fpga.hpp                     | 4 ++--
 include/villas/nodes/iec60870.hpp                 | 4 ++--
 include/villas/nodes/iec61850.hpp                 | 4 ++--
 include/villas/nodes/iec61850_goose.hpp           | 4 ++--
 include/villas/nodes/iec61850_sv.hpp              | 4 ++--
 include/villas/nodes/infiniband.hpp               | 4 ++--
 include/villas/nodes/influxdb.hpp                 | 4 ++--
 include/villas/nodes/kafka.hpp                    | 4 ++--
 include/villas/nodes/loopback.hpp                 | 4 ++--
 include/villas/nodes/loopback_internal.hpp        | 4 ++--
 include/villas/nodes/modbus.hpp                   | 6 +++---
 include/villas/nodes/mqtt.hpp                     | 4 ++--
 include/villas/nodes/nanomsg.hpp                  | 4 ++--
 include/villas/nodes/ngsi.hpp                     | 4 ++--
 include/villas/nodes/opal.hpp                     | 4 ++--
 include/villas/nodes/redis.hpp                    | 4 ++--
 include/villas/nodes/redis_helpers.hpp            | 6 +++---
 include/villas/nodes/rtp.hpp                      | 4 ++--
 include/villas/nodes/shmem.hpp                    | 4 ++--
 include/villas/nodes/signal.hpp                   | 4 ++--
 include/villas/nodes/signal_old.hpp               | 4 ++--
 include/villas/nodes/socket.hpp                   | 4 ++--
 include/villas/nodes/stats.hpp                    | 4 ++--
 include/villas/nodes/temper.hpp                   | 4 ++--
 include/villas/nodes/test_rtt.hpp                 | 4 ++--
 include/villas/nodes/uldaq.hpp                    | 4 ++--
 include/villas/nodes/webrtc.hpp                   | 4 ++--
 include/villas/nodes/webrtc/peer_connection.hpp   | 6 +++---
 include/villas/nodes/webrtc/signaling_client.hpp  | 6 +++---
 include/villas/nodes/webrtc/signaling_message.hpp | 6 +++---
 include/villas/nodes/websocket.hpp                | 4 ++--
 include/villas/nodes/zeromq.hpp                   | 4 ++--
 include/villas/path.hpp                           | 4 ++--
 include/villas/path_destination.hpp               | 4 ++--
 include/villas/path_list.hpp                      | 4 ++--
 include/villas/path_source.hpp                    | 4 ++--
 include/villas/pool.hpp                           | 4 ++--
 include/villas/queue.h                            | 4 ++--
 include/villas/queue.hpp                          | 2 +-
 include/villas/queue_signalled.h                  | 4 ++--
 include/villas/queue_signalled.hpp                | 2 +-
 include/villas/sample.hpp                         | 4 ++--
 include/villas/shmem.hpp                          | 4 ++--
 include/villas/signal.hpp                         | 4 ++--
 include/villas/signal_data.hpp                    | 4 ++--
 include/villas/signal_list.hpp                    | 4 ++--
 include/villas/signal_type.hpp                    | 4 ++--
 include/villas/socket_addr.hpp                    | 4 ++--
 include/villas/stats.hpp                          | 2 +-
 include/villas/super_node.hpp                     | 4 ++--
 include/villas/usb.hpp                            | 4 ++--
 include/villas/web.hpp                            | 4 ++--
 lib/api/requests/capabiltities.cpp                | 6 +++---
 lib/api/requests/config.cpp                       | 6 +++---
 lib/api/requests/graph.cpp                        | 6 +++---
 lib/api/requests/node_action.cpp                  | 6 +++---
 lib/api/requests/node_file.cpp                    | 6 +++---
 lib/api/requests/node_info.cpp                    | 6 +++---
 lib/api/requests/node_stats.cpp                   | 6 +++---
 lib/api/requests/node_stats_reset.cpp             | 6 +++---
 lib/api/requests/nodes.cpp                        | 6 +++---
 lib/api/requests/path_action.cpp                  | 6 +++---
 lib/api/requests/path_info.cpp                    | 6 +++---
 lib/api/requests/paths.cpp                        | 6 +++---
 lib/api/requests/restart.cpp                      | 6 +++---
 lib/api/requests/shutdown.cpp                     | 6 +++---
 lib/api/requests/status.cpp                       | 6 +++---
 lib/api/requests/universal/channel.cpp            | 8 ++++----
 lib/api/requests/universal/channels.cpp           | 8 ++++----
 lib/api/requests/universal/info.cpp               | 8 ++++----
 lib/api/requests/universal/status.cpp             | 8 ++++----
 lib/hooks/average.cpp                             | 4 ++--
 lib/hooks/cast.cpp                                | 4 ++--
 lib/hooks/decimate.cpp                            | 4 ++--
 lib/hooks/dp.cpp                                  | 4 ++--
 lib/hooks/drop.cpp                                | 4 ++--
 lib/hooks/dump.cpp                                | 4 ++--
 lib/hooks/ebm.cpp                                 | 4 ++--
 lib/hooks/fix.cpp                                 | 4 ++--
 lib/hooks/gate.cpp                                | 4 ++--
 lib/hooks/jitter_calc.cpp                         | 4 ++--
 lib/hooks/limit_rate.cpp                          | 4 ++--
 lib/hooks/limit_value.cpp                         | 4 ++--
 lib/hooks/lua.cpp                                 | 4 ++--
 lib/hooks/ma.cpp                                  | 4 ++--
 lib/hooks/pmu.cpp                                 | 4 ++--
 lib/hooks/pmu_dft.cpp                             | 6 +++---
 lib/hooks/pmu_ipdft.cpp                           | 4 ++--
 lib/hooks/power.cpp                               | 4 ++--
 lib/hooks/pps_ts.cpp                              | 4 ++--
 lib/hooks/print.cpp                               | 4 ++--
 lib/hooks/restart.cpp                             | 4 ++--
 lib/hooks/rms.cpp                                 | 4 ++--
 lib/hooks/round.cpp                               | 4 ++--
 lib/hooks/scale.cpp                               | 4 ++--
 lib/hooks/shift_seq.cpp                           | 4 ++--
 lib/hooks/shift_ts.cpp                            | 4 ++--
 lib/hooks/skip_first.cpp                          | 4 ++--
 lib/hooks/stats.cpp                               | 4 ++--
 lib/hooks/ts.cpp                                  | 4 ++--
 plugins/example_hook.cpp                          | 4 ++--
 src/villas-compare.cpp                            | 6 +++---
 src/villas-conf2json.cpp                          | 6 +++---
 src/villas-convert.cpp                            | 6 +++---
 src/villas-graph.cpp                              | 6 +++---
 src/villas-hook.cpp                               | 6 +++---
 src/villas-pipe.cpp                               | 6 +++---
 src/villas-relay.cpp                              | 6 +++---
 src/villas-relay.hpp                              | 6 +++---
 src/villas-signal.cpp                             | 6 +++---
 src/villas-test-config.cpp                        | 6 +++---
 src/villas-test-rtt.cpp                           | 6 +++---
 src/villas-zmq-keygen.cpp                         | 6 +++---
 172 files changed, 397 insertions(+), 397 deletions(-)

diff --git a/clients/shmem/villas-shmem.cpp b/clients/shmem/villas-shmem.cpp
index 877b833f7..345b5ca4f 100644
--- a/clients/shmem/villas-shmem.cpp
+++ b/clients/shmem/villas-shmem.cpp
@@ -117,9 +117,9 @@ protected:
 	}
 };
 
-} /* namespace tools */
-} /* namespace node */
-} /* namespace villas */
+} // namespace tools
+} // namespace node
+} // namespace villas
 
 int main(int argc, char *argv[])
 {
diff --git a/include/villas/api.hpp b/include/villas/api.hpp
index bbb32680f..fc8da99de 100644
--- a/include/villas/api.hpp
+++ b/include/villas/api.hpp
@@ -73,7 +73,7 @@ public:
 	InvalidMethod(Request *req);
 };
 
-} /* namespace api */
+} // namespace api
 
 /* Forward declarations */
 class SuperNode;
@@ -113,5 +113,5 @@ public:
 	villas::QueueSignalled<api::Session *> pending;	/**< A queue of api_sessions which have pending requests. */
 };
 
-} /* namespace node */
-} /* namespace villas */
+} // namespace node
+} // namespace villas
diff --git a/include/villas/api/request.hpp b/include/villas/api/request.hpp
index ac962d26b..5f3b3b29a 100644
--- a/include/villas/api/request.hpp
+++ b/include/villas/api/request.hpp
@@ -179,6 +179,6 @@ public:
 	}
 };
 
-} /* namespace api */
-} /* namespace node */
-} /* namespace villas */
+} // namespace api
+} // namespace node
+} // namespace villas
diff --git a/include/villas/api/requests/node.hpp b/include/villas/api/requests/node.hpp
index 71cb40708..e8672f770 100644
--- a/include/villas/api/requests/node.hpp
+++ b/include/villas/api/requests/node.hpp
@@ -30,6 +30,6 @@ public:
 	prepare();
 };
 
-} /* namespace api */
-} /* namespace node */
-} /* namespace villas */
+} // namespace api
+} // namespace node
+} // namespace villas
diff --git a/include/villas/api/requests/path.hpp b/include/villas/api/requests/path.hpp
index c3d05528e..9868cd0ce 100644
--- a/include/villas/api/requests/path.hpp
+++ b/include/villas/api/requests/path.hpp
@@ -28,6 +28,6 @@ public:
 	prepare();
 };
 
-} /* namespace api */
-} /* namespace node */
-} /* namespace villas */
+} // namespace api
+} // namespace node
+} // namespace villas
diff --git a/include/villas/api/requests/universal.hpp b/include/villas/api/requests/universal.hpp
index 25be3940e..cc12d2ba6 100644
--- a/include/villas/api/requests/universal.hpp
+++ b/include/villas/api/requests/universal.hpp
@@ -31,6 +31,6 @@ public:
 	prepare();
 };
 
-} /* namespace api */
-} /* namespace node */
-} /* namespace villas */
+} // namespace api
+} // namespace node
+} // namespace villas
diff --git a/include/villas/api/response.hpp b/include/villas/api/response.hpp
index ac9c6434b..79afd3be9 100644
--- a/include/villas/api/response.hpp
+++ b/include/villas/api/response.hpp
@@ -95,6 +95,6 @@ public:
 	}
 };
 
-} /* namespace api */
-} /* namespace node */
-} /* namespace villas */
+} // namespace api
+} // namespace node
+} // namespace villas
diff --git a/include/villas/api/session.hpp b/include/villas/api/session.hpp
index 5c0aa7c77..b62ec896c 100644
--- a/include/villas/api/session.hpp
+++ b/include/villas/api/session.hpp
@@ -102,6 +102,6 @@ public:
 	methodToString(Method meth);
 };
 
-} /* namespace api */
-} /* namespace node */
-} /* namespace villas */
+} // namespace api
+} // namespace node
+} // namespace villas
diff --git a/include/villas/api/universal.hpp b/include/villas/api/universal.hpp
index 00e4500cc..fb13678ed 100644
--- a/include/villas/api/universal.hpp
+++ b/include/villas/api/universal.hpp
@@ -51,7 +51,7 @@ public:
 	void parse(json_t *json, bool readable, bool writable);
 };
 
-} /* namespace universal */
-} /* namespace api */
-} /* namespace node */
-} /* namespace villas */
+} // namespace universal
+} // namespace api
+} // namespace node
+} // namespace villas
diff --git a/include/villas/capabilities.hpp b/include/villas/capabilities.hpp
index c7e54d51c..195f3c5f3 100644
--- a/include/villas/capabilities.hpp
+++ b/include/villas/capabilities.hpp
@@ -14,5 +14,5 @@ namespace node {
 
 json_t * getCapabilities();
 
-} /* namespace node */
+} // namespace node
 } /* namepace vilals */
diff --git a/include/villas/config_class.hpp b/include/villas/config_class.hpp
index 567f75dc9..f49563655 100644
--- a/include/villas/config_class.hpp
+++ b/include/villas/config_class.hpp
@@ -87,5 +87,5 @@ public:
 	json_t * load(const std::string &u, bool resolveIncludes = true, bool resolveEnvVars = true);
 };
 
-} /* namespace node */
-} /* namespace villas */
+} // namespace node
+} // namespace villas
diff --git a/include/villas/config_helper.hpp b/include/villas/config_helper.hpp
index 17bb6e73b..ae66b2811 100644
--- a/include/villas/config_helper.hpp
+++ b/include/villas/config_helper.hpp
@@ -40,5 +40,5 @@ int json_object_extend(json_t *orig, json_t *merge);
 
 json_t * json_load_cli(int argc, const char *argv[]);
 
-} /* namespace node */
-} /* namespace villas */
+} // namespace node
+} // namespace villas
diff --git a/include/villas/dumper.hpp b/include/villas/dumper.hpp
index 35e0cda9b..762814230 100644
--- a/include/villas/dumper.hpp
+++ b/include/villas/dumper.hpp
@@ -39,5 +39,5 @@ public:
 	void writeDataBinary(unsigned len, double *yData, double *xData = nullptr);
 };
 
-} /* namespace node */
-} /* namespace villas */
+} // namespace node
+} // namespace villas
diff --git a/include/villas/format.hpp b/include/villas/format.hpp
index 901836c34..8cafd277b 100644
--- a/include/villas/format.hpp
+++ b/include/villas/format.hpp
@@ -193,5 +193,5 @@ public:
 	}
 };
 
-} /* namespace node */
-} /* namespace villas */
+} // namespace node
+} // namespace villas
diff --git a/include/villas/formats/column.hpp b/include/villas/formats/column.hpp
index 585f9a930..5449a5d16 100644
--- a/include/villas/formats/column.hpp
+++ b/include/villas/formats/column.hpp
@@ -66,5 +66,5 @@ public:
 	}
 };
 
-} /* namespace node */
-} /* namespace villas */
+} // namespace node
+} // namespace villas
diff --git a/include/villas/formats/iotagent_ul.hpp b/include/villas/formats/iotagent_ul.hpp
index bb56b52f3..547ff40f3 100644
--- a/include/villas/formats/iotagent_ul.hpp
+++ b/include/villas/formats/iotagent_ul.hpp
@@ -28,5 +28,5 @@ public:
 	using Format::Format;
 };
 
-} /* namespace node */
-} /* namespace villas */
+} // namespace node
+} // namespace villas
diff --git a/include/villas/formats/json.hpp b/include/villas/formats/json.hpp
index 8fc0ccf66..40cbb9e56 100644
--- a/include/villas/formats/json.hpp
+++ b/include/villas/formats/json.hpp
@@ -56,5 +56,5 @@ public:
 	void parse(json_t *json);
 };
 
-} /* namespace node */
-} /* namespace villas */
+} // namespace node
+} // namespace villas
diff --git a/include/villas/formats/json_edgeflex.hpp b/include/villas/formats/json_edgeflex.hpp
index df5c7c331..8a22c714d 100644
--- a/include/villas/formats/json_edgeflex.hpp
+++ b/include/villas/formats/json_edgeflex.hpp
@@ -24,5 +24,5 @@ public:
 	using JsonFormat::JsonFormat;
 };
 
-} /* namespace node */
-} /* namespace villas */
+} // namespace node
+} // namespace villas
diff --git a/include/villas/formats/json_kafka.hpp b/include/villas/formats/json_kafka.hpp
index 6876d79d3..236388465 100644
--- a/include/villas/formats/json_kafka.hpp
+++ b/include/villas/formats/json_kafka.hpp
@@ -32,5 +32,5 @@ public:
 	void parse(json_t *json);
 };
 
-} /* namespace node */
-} /* namespace villas */
+} // namespace node
+} // namespace villas
diff --git a/include/villas/formats/json_reserve.hpp b/include/villas/formats/json_reserve.hpp
index 4e236309b..7800a0419 100644
--- a/include/villas/formats/json_reserve.hpp
+++ b/include/villas/formats/json_reserve.hpp
@@ -24,5 +24,5 @@ public:
 	using JsonFormat::JsonFormat;
 };
 
-} /* namespace node */
-} /* namespace villas */
+} // namespace node
+} // namespace villas
diff --git a/include/villas/formats/line.hpp b/include/villas/formats/line.hpp
index 30a19ef8e..54a4df2f1 100644
--- a/include/villas/formats/line.hpp
+++ b/include/villas/formats/line.hpp
@@ -87,5 +87,5 @@ public:
 	}
 };
 
-} /* namespace node */
-} /* namespace villas */
+} // namespace node
+} // namespace villas
diff --git a/include/villas/formats/msg.hpp b/include/villas/formats/msg.hpp
index 62b120420..dc9c6e795 100644
--- a/include/villas/formats/msg.hpp
+++ b/include/villas/formats/msg.hpp
@@ -48,5 +48,5 @@ int msg_to_sample(const struct Message *msg, struct Sample *smp, const SignalLis
 /** Copy fields form \p smp into \p msg. */
 int msg_from_sample(struct Message *msg, const struct Sample *smp, const SignalList::Ptr sigs, uint8_t source_index);
 
-} /* namespace node */
-} /* namespace villas */
+} // namespace node
+} // namespace villas
diff --git a/include/villas/formats/msg_format.hpp b/include/villas/formats/msg_format.hpp
index 6ee6e1e9d..64ed1e4b1 100644
--- a/include/villas/formats/msg_format.hpp
+++ b/include/villas/formats/msg_format.hpp
@@ -70,5 +70,5 @@ struct Message
 	} data[];
 } __attribute__((packed));
 
-} /* namespace node */
-} /* namespace villas */
+} // namespace node
+} // namespace villas
diff --git a/include/villas/formats/opal_asyncip.hpp b/include/villas/formats/opal_asyncip.hpp
index d154b74c2..d74593923 100644
--- a/include/villas/formats/opal_asyncip.hpp
+++ b/include/villas/formats/opal_asyncip.hpp
@@ -74,5 +74,5 @@ public:
 	}
 };
 
-} /* namespace node */
-} /* namespace villas */
+} // namespace node
+} // namespace villas
diff --git a/include/villas/formats/protobuf.hpp b/include/villas/formats/protobuf.hpp
index e3b8d91c4..cac4f68c9 100644
--- a/include/villas/formats/protobuf.hpp
+++ b/include/villas/formats/protobuf.hpp
@@ -35,5 +35,5 @@ public:
 	int sprint(char *buf, size_t len, size_t *wbytes, const struct Sample * const smps[], unsigned cnt);
 };
 
-} /* namespace node */
-} /* namespace villas */
+} // namespace node
+} // namespace villas
diff --git a/include/villas/formats/raw.hpp b/include/villas/formats/raw.hpp
index 95d06b356..c4e0201c0 100644
--- a/include/villas/formats/raw.hpp
+++ b/include/villas/formats/raw.hpp
@@ -66,5 +66,5 @@ public:
 	{ }
 };
 
-} /* namespace node */
-} /* namespace villas */
+} // namespace node
+} // namespace villas
diff --git a/include/villas/formats/value.hpp b/include/villas/formats/value.hpp
index 83763090f..4cc1e902a 100644
--- a/include/villas/formats/value.hpp
+++ b/include/villas/formats/value.hpp
@@ -26,5 +26,5 @@ public:
 	int sprint(char *buf, size_t len, size_t *wbytes, const struct Sample * const smps[], unsigned cnt);
 };
 
-} /* namespace node */
-} /* namespace villas */
+} // namespace node
+} // namespace villas
diff --git a/include/villas/formats/villas_binary.hpp b/include/villas/formats/villas_binary.hpp
index 81146ad8f..520e1a84b 100644
--- a/include/villas/formats/villas_binary.hpp
+++ b/include/villas/formats/villas_binary.hpp
@@ -81,5 +81,5 @@ public:
 	}
 };
 
-} /* namespace node */
-} /* namespace villas */
+} // namespace node
+} // namespace villas
diff --git a/include/villas/formats/villas_human.hpp b/include/villas/formats/villas_human.hpp
index 58e97899c..bf99a6475 100644
--- a/include/villas/formats/villas_human.hpp
+++ b/include/villas/formats/villas_human.hpp
@@ -30,5 +30,5 @@ public:
 	void header(FILE *f, const SignalList::Ptr sigs);
 };
 
-} /* namespace node */
-} /* namespace villas */
+} // namespace node
+} // namespace villas
diff --git a/include/villas/hook.hpp b/include/villas/hook.hpp
index 233d13386..3624b3d20 100644
--- a/include/villas/hook.hpp
+++ b/include/villas/hook.hpp
@@ -307,5 +307,5 @@ public:
 	}
 };
 
-} /* namespace node */
-} /* namespace villas */
+} // namespace node
+} // namespace villas
diff --git a/include/villas/hook_list.hpp b/include/villas/hook_list.hpp
index 2ed1c7c9e..70d23eba7 100644
--- a/include/villas/hook_list.hpp
+++ b/include/villas/hook_list.hpp
@@ -64,5 +64,5 @@ public:
 	json_t * toJson() const;
 };
 
-} /* namespace node */
-} /* namespace villas */
+} // namespace node
+} // namespace villas
diff --git a/include/villas/hooks/decimate.hpp b/include/villas/hooks/decimate.hpp
index 35251767a..d5f1c8a17 100644
--- a/include/villas/hooks/decimate.hpp
+++ b/include/villas/hooks/decimate.hpp
@@ -49,6 +49,6 @@ public:
 	Hook::Reason process(struct Sample *smp);
 };
 
-} /* namespace node */
-} /* namespace villas */
+} // namespace node
+} // namespace villas
 
diff --git a/include/villas/hooks/limit_rate.hpp b/include/villas/hooks/limit_rate.hpp
index 9e443c9ba..92b08ad99 100644
--- a/include/villas/hooks/limit_rate.hpp
+++ b/include/villas/hooks/limit_rate.hpp
@@ -42,5 +42,5 @@ public:
 	virtual Hook::Reason process(struct Sample *smp);
 };
 
-} /* namespace node */
-} /* namespace villas */
+} // namespace node
+} // namespace villas
diff --git a/include/villas/hooks/lua.hpp b/include/villas/hooks/lua.hpp
index 2a5672ab5..49de8b140 100644
--- a/include/villas/hooks/lua.hpp
+++ b/include/villas/hooks/lua.hpp
@@ -129,5 +129,5 @@ public:
 };
 
 
-} /* namespace node */
-} /* namespace villas */
+} // namespace node
+} // namespace villas
diff --git a/include/villas/hooks/pmu.hpp b/include/villas/hooks/pmu.hpp
index 30b1ea5a5..088f52381 100644
--- a/include/villas/hooks/pmu.hpp
+++ b/include/villas/hooks/pmu.hpp
@@ -84,5 +84,5 @@ public:
 	Phasor estimatePhasor(dsp::CosineWindow<double> *window, Phasor lastPhasor);
 };
 
-} /* namespace node */
-} /* namespace villas */
+} // namespace node
+} // namespace villas
diff --git a/include/villas/kernel/if.hpp b/include/villas/kernel/if.hpp
index 48ac20dd1..0fdcb1bf4 100644
--- a/include/villas/kernel/if.hpp
+++ b/include/villas/kernel/if.hpp
@@ -115,5 +115,5 @@ public:
 	}
 };
 
-} /* namespace kernel */
-} /* namespace villas */
+} // namespace kernel
+} // namespace villas
diff --git a/include/villas/kernel/nl.hpp b/include/villas/kernel/nl.hpp
index c2c83c50e..ca4fcbda6 100644
--- a/include/villas/kernel/nl.hpp
+++ b/include/villas/kernel/nl.hpp
@@ -41,6 +41,6 @@ struct nl_sock * init();
 /** Close and free global netlink socket. */
 void shutdown();
 
-} /* namespace nl */
-} /* namespace kernel */
-} /* namespace villas */
+} // namespace nl
+} // namespace kernel
+} // namespace villas
diff --git a/include/villas/kernel/tc.hpp b/include/villas/kernel/tc.hpp
index 0a51053c4..55adcab83 100644
--- a/include/villas/kernel/tc.hpp
+++ b/include/villas/kernel/tc.hpp
@@ -61,6 +61,6 @@ int prio(Interface *i, struct rtnl_qdisc **qd, tc_hdl_t handle, tc_hdl_t, int ba
 */
 int mark(Interface *i, struct rtnl_cls **cls, tc_hdl_t flowid, uint32_t mark);
 
-} /* namespace tc */
-} /* namespace kernel */
-} /* namespace villas */
+} // namespace tc
+} // namespace kernel
+} // namespace villas
diff --git a/include/villas/kernel/tc_netem.hpp b/include/villas/kernel/tc_netem.hpp
index 0559c3e89..dea2d776c 100644
--- a/include/villas/kernel/tc_netem.hpp
+++ b/include/villas/kernel/tc_netem.hpp
@@ -59,6 +59,6 @@ int netem(Interface *i, struct rtnl_qdisc **qd, tc_hdl_t handle, tc_hdl_t parent
 
 int netem_set_delay_distribution(struct rtnl_qdisc *qdisc, json_t *json);
 
-} /* namespace tc */
-} /* namespace kernel */
-} /* namespace villas */
+} // namespace tc
+} // namespace kernel
+} // namespace villas
diff --git a/include/villas/log_opal_sink.hpp b/include/villas/log_opal_sink.hpp
index 1826e1546..9cd390c79 100644
--- a/include/villas/log_opal_sink.hpp
+++ b/include/villas/log_opal_sink.hpp
@@ -54,5 +54,5 @@ using OpalSink_mt = OpalSink<std::mutex>;
 using OpalSink_st = OpalSink<spdlog::details::null_mutex>;
 
 
-} /* namespace node */
-} /* namespace villas */
+} // namespace node
+} // namespace villas
diff --git a/include/villas/mapping.hpp b/include/villas/mapping.hpp
index df1c1494f..c760325e9 100644
--- a/include/villas/mapping.hpp
+++ b/include/villas/mapping.hpp
@@ -106,5 +106,5 @@ public:
 	Signal::Ptr toSignal(unsigned index) const;
 };
 
-} /* namespace node */
-} /* namespace villas */
+} // namespace node
+} // namespace villas
diff --git a/include/villas/mapping_list.hpp b/include/villas/mapping_list.hpp
index b21695a2c..e6e480ddb 100644
--- a/include/villas/mapping_list.hpp
+++ b/include/villas/mapping_list.hpp
@@ -28,5 +28,5 @@ public:
 	int update(const MappingEntry::Ptr me, struct Sample *remapped, const struct Sample *original);
 };
 
-} /* namespace node */
-} /* namespace villas */
+} // namespace node
+} // namespace villas
diff --git a/include/villas/memory/ib.h b/include/villas/memory/ib.h
index 23d15779f..164b6640d 100644
--- a/include/villas/memory/ib.h
+++ b/include/villas/memory/ib.h
@@ -21,6 +21,6 @@ struct IB {
 
 struct ibv_mr * ib_get_mr(void *ptr);
 
-} /* namespace memory */
-} /* namespace node */
-} /* namespace villas */
+} // namespace memory
+} // namespace node
+} // namespace villas
diff --git a/include/villas/node.hpp b/include/villas/node.hpp
index 8cec6db01..a69ab1eab 100644
--- a/include/villas/node.hpp
+++ b/include/villas/node.hpp
@@ -481,5 +481,5 @@ public:
 	}
 };
 
-} /* namespace node */
-} /* namespace villas */
+} // namespace node
+} // namespace villas
diff --git a/include/villas/node/exceptions.hpp b/include/villas/node/exceptions.hpp
index 2225ab9af..4f72e828d 100644
--- a/include/villas/node/exceptions.hpp
+++ b/include/villas/node/exceptions.hpp
@@ -71,5 +71,5 @@ public:
 	{ }
 };
 
-} /* namespace node */
-} /* namespace villas */
+} // namespace node
+} // namespace villas
diff --git a/include/villas/node/memory.hpp b/include/villas/node/memory.hpp
index c7a0db721..930cda757 100644
--- a/include/villas/node/memory.hpp
+++ b/include/villas/node/memory.hpp
@@ -71,6 +71,6 @@ int free(void *ptr);
 
 struct Allocation * get_allocation(void *ptr);
 
-} /* namespace memory */
-} /* namespace node */
-} /* namespace villas */
+} // namespace memory
+} // namespace node
+} // namespace villas
diff --git a/include/villas/node/memory_type.hpp b/include/villas/node/memory_type.hpp
index 98f6ef587..0756b885e 100644
--- a/include/villas/node/memory_type.hpp
+++ b/include/villas/node/memory_type.hpp
@@ -53,6 +53,6 @@ struct Type * managed(void *ptr, size_t len);
 
 int mmap_init(int hugepages) __attribute__ ((warn_unused_result));
 
-} /* namespace memory */
-} /* namespace node */
-} /* namespace villas */
+} // namespace memory
+} // namespace node
+} // namespace villas
diff --git a/include/villas/node_compat.hpp b/include/villas/node_compat.hpp
index b1d40c78f..4c8b13333 100644
--- a/include/villas/node_compat.hpp
+++ b/include/villas/node_compat.hpp
@@ -202,5 +202,5 @@ public:
 	int stop();
 };
 
-} /* namespace node */
-} /* namespace villas */
+} // namespace node
+} // namespace villas
diff --git a/include/villas/node_compat_type.hpp b/include/villas/node_compat_type.hpp
index b962d68a6..4535b28f7 100644
--- a/include/villas/node_compat_type.hpp
+++ b/include/villas/node_compat_type.hpp
@@ -220,5 +220,5 @@ public:
 	struct memory::Type * (*memory_type)(NodeCompat *n, struct memory::Type *parent);
 };
 
-} /* namespace node */
-} /* namespace villas */
+} // namespace node
+} // namespace villas
diff --git a/include/villas/node_direction.hpp b/include/villas/node_direction.hpp
index 053374d4c..54b87d518 100644
--- a/include/villas/node_direction.hpp
+++ b/include/villas/node_direction.hpp
@@ -61,5 +61,5 @@ public:
 	unsigned getSignalsMaxCount() const;
 };
 
-} /* namespace node */
-} /* namespace villas */
+} // namespace node
+} // namespace villas
diff --git a/include/villas/node_list.hpp b/include/villas/node_list.hpp
index 52c05d16d..51d95f954 100644
--- a/include/villas/node_list.hpp
+++ b/include/villas/node_list.hpp
@@ -45,5 +45,5 @@ public:
 	json_t * toJson() const;
 };
 
-} /* namespace node */
-} /* namespace villas */
+} // namespace node
+} // namespace villas
diff --git a/include/villas/nodes/amqp.hpp b/include/villas/nodes/amqp.hpp
index 8ea42a03d..e928cc5ef 100644
--- a/include/villas/nodes/amqp.hpp
+++ b/include/villas/nodes/amqp.hpp
@@ -67,5 +67,5 @@ int amqp_read(NodeCompat *n, struct Sample * const smps[], unsigned cnt);
 
 int amqp_write(NodeCompat *n, struct Sample * const smps[], unsigned cnt);
 
-} /* namespace node */
-} /* namespace villas */
+} // namespace node
+} // namespace villas
diff --git a/include/villas/nodes/api.hpp b/include/villas/nodes/api.hpp
index ecbf75682..79ce3f4e2 100644
--- a/include/villas/nodes/api.hpp
+++ b/include/villas/nodes/api.hpp
@@ -51,5 +51,5 @@ protected:
 	int _write(struct Sample *smps[], unsigned cnt);
 };
 
-} /* namespace node */
-} /* namespace villas */
+} // namespace node
+} // namespace villas
diff --git a/include/villas/nodes/can.hpp b/include/villas/nodes/can.hpp
index 5b3d0839a..0c382da04 100644
--- a/include/villas/nodes/can.hpp
+++ b/include/villas/nodes/can.hpp
@@ -60,5 +60,5 @@ int can_read(NodeCompat *n, struct Sample * const smps[], unsigned cnt);
 
 int can_poll_fds(NodeCompat *n, int fds[]);
 
-} /* namespace node */
-} /* namespace villas */
+} // namespace node
+} // namespace villas
diff --git a/include/villas/nodes/comedi.hpp b/include/villas/nodes/comedi.hpp
index a5bc3eb7b..c09a8970a 100644
--- a/include/villas/nodes/comedi.hpp
+++ b/include/villas/nodes/comedi.hpp
@@ -78,5 +78,5 @@ int comedi_read(NodeCompat *n, struct Sample * const smps[], unsigned cnt);
 
 int comedi_write(NodeCompat *n, struct Sample * const smps[], unsigned cnt);
 
-} /* namespace node */
-} /* namespace villas */
+} // namespace node
+} // namespace villas
diff --git a/include/villas/nodes/ethercat.hpp b/include/villas/nodes/ethercat.hpp
index 43169955d..3de4a57d0 100644
--- a/include/villas/nodes/ethercat.hpp
+++ b/include/villas/nodes/ethercat.hpp
@@ -91,5 +91,5 @@ int ethercat_read(NodeCompat *n, struct Sample * const smps[], unsigned cnt);
 
 int ethercat_write(NodeCompat *n, struct Sample * const smps[], unsigned cnt);
 
-} /* namespace node */
-} /* namespace villas */
+} // namespace node
+} // namespace villas
diff --git a/include/villas/nodes/example.hpp b/include/villas/nodes/example.hpp
index 005bb2b24..5afbe6e9f 100644
--- a/include/villas/nodes/example.hpp
+++ b/include/villas/nodes/example.hpp
@@ -93,5 +93,5 @@ public:
 };
 
 
-} /* namespace node */
-} /* namespace villas */
+} // namespace node
+} // namespace villas
diff --git a/include/villas/nodes/exec.hpp b/include/villas/nodes/exec.hpp
index af8a07c88..6f666cdd7 100644
--- a/include/villas/nodes/exec.hpp
+++ b/include/villas/nodes/exec.hpp
@@ -72,5 +72,5 @@ public:
 	std::vector<int> getPollFDs();
 };
 
-} /* namespace node */
-} /* namespace villas */
+} // namespace node
+} // namespace villas
diff --git a/include/villas/nodes/file.hpp b/include/villas/nodes/file.hpp
index 01bc952ec..72dd1bf4b 100644
--- a/include/villas/nodes/file.hpp
+++ b/include/villas/nodes/file.hpp
@@ -73,5 +73,5 @@ int file_read(NodeCompat *n, struct Sample * const smps[], unsigned cnt);
 
 int file_write(NodeCompat *n, struct Sample * const smps[], unsigned cnt);
 
-} /* namespace node */
-} /* namespace villas */
+} // namespace node
+} // namespace villas
diff --git a/include/villas/nodes/fpga.hpp b/include/villas/nodes/fpga.hpp
index b76aa784e..79edaf907 100644
--- a/include/villas/nodes/fpga.hpp
+++ b/include/villas/nodes/fpga.hpp
@@ -113,5 +113,5 @@ public:
 	int start(SuperNode *sn);
 };
 
-} /* namespace node */
-} /* namespace villas */
+} // namespace node
+} // namespace villas
diff --git a/include/villas/nodes/iec60870.hpp b/include/villas/nodes/iec60870.hpp
index f245c29da..e487f2040 100644
--- a/include/villas/nodes/iec60870.hpp
+++ b/include/villas/nodes/iec60870.hpp
@@ -187,5 +187,5 @@ public:
 };
 
 } /* namespace iec60870 */
-} /* namespace node */
-} /* namespace villas */
+} // namespace node
+} // namespace villas
diff --git a/include/villas/nodes/iec61850.hpp b/include/villas/nodes/iec61850.hpp
index 002b6e9d0..786744129 100644
--- a/include/villas/nodes/iec61850.hpp
+++ b/include/villas/nodes/iec61850.hpp
@@ -101,5 +101,5 @@ int iec61850_receiver_destroy(struct iec61850_receiver *r);
 
 const struct iec61850_type_descriptor * iec61850_lookup_type(const char *name);
 
-} /* namespace node */
-} /* namespace villas */
+} // namespace node
+} // namespace villas
diff --git a/include/villas/nodes/iec61850_goose.hpp b/include/villas/nodes/iec61850_goose.hpp
index 4f60fb99e..c11770b4e 100644
--- a/include/villas/nodes/iec61850_goose.hpp
+++ b/include/villas/nodes/iec61850_goose.hpp
@@ -255,5 +255,5 @@ public:
 };
 
 } /* namespace iec61850 */
-} /* namespace node */
-} /* namespace villas */
+} // namespace node
+} // namespace villas
diff --git a/include/villas/nodes/iec61850_sv.hpp b/include/villas/nodes/iec61850_sv.hpp
index 6be13f043..51c7ef121 100644
--- a/include/villas/nodes/iec61850_sv.hpp
+++ b/include/villas/nodes/iec61850_sv.hpp
@@ -79,5 +79,5 @@ int iec61850_sv_write(NodeCompat *n, struct Sample * const smps[], unsigned cnt)
 
 int iec61850_sv_poll_fds(NodeCompat *n, int fds[]);
 
-} /* namespace node */
-} /* namespace villas */
+} // namespace node
+} // namespace villas
diff --git a/include/villas/nodes/infiniband.hpp b/include/villas/nodes/infiniband.hpp
index 26445fc39..0678b37a5 100644
--- a/include/villas/nodes/infiniband.hpp
+++ b/include/villas/nodes/infiniband.hpp
@@ -111,5 +111,5 @@ int ib_read(NodeCompat *n, struct Sample * const smps[], unsigned cnt);
 
 int ib_write(NodeCompat *n, struct Sample * const smps[], unsigned cnt);
 
-} /* namespace node */
-} /* namespace villas */
+} // namespace node
+} // namespace villas
diff --git a/include/villas/nodes/influxdb.hpp b/include/villas/nodes/influxdb.hpp
index a31174ab2..91e66e6bf 100644
--- a/include/villas/nodes/influxdb.hpp
+++ b/include/villas/nodes/influxdb.hpp
@@ -37,5 +37,5 @@ int influxdb_close(NodeCompat *n);
 
 int influxdb_write(NodeCompat *n, struct Sample * const smps[], unsigned cnt);
 
-} /* namespace node */
-} /* namespace villas */
+} // namespace node
+} // namespace villas
diff --git a/include/villas/nodes/kafka.hpp b/include/villas/nodes/kafka.hpp
index 3c25b5150..a7bffb9c6 100644
--- a/include/villas/nodes/kafka.hpp
+++ b/include/villas/nodes/kafka.hpp
@@ -80,5 +80,5 @@ int kafka_read(NodeCompat *n, struct Sample * const smps[], unsigned cnt);
 
 int kafka_write(NodeCompat *n, struct Sample * const smps[], unsigned cnt);
 
-} /* namespace node */
-} /* namespace villas */
+} // namespace node
+} // namespace villas
diff --git a/include/villas/nodes/loopback.hpp b/include/villas/nodes/loopback.hpp
index 2395b8aad..7813e24e4 100644
--- a/include/villas/nodes/loopback.hpp
+++ b/include/villas/nodes/loopback.hpp
@@ -50,5 +50,5 @@ public:
 	int parse(json_t *json);
 };
 
-} /* namespace node */
-} /* namespace villas */
+} // namespace node
+} // namespace villas
diff --git a/include/villas/nodes/loopback_internal.hpp b/include/villas/nodes/loopback_internal.hpp
index cecf511c7..ff38604e2 100644
--- a/include/villas/nodes/loopback_internal.hpp
+++ b/include/villas/nodes/loopback_internal.hpp
@@ -75,5 +75,5 @@ public:
 	}
 };
 
-} /* namespace node */
-} /* namespace villas */
+} // namespace node
+} // namespace villas
diff --git a/include/villas/nodes/modbus.hpp b/include/villas/nodes/modbus.hpp
index c7df327cb..b5472602d 100644
--- a/include/villas/nodes/modbus.hpp
+++ b/include/villas/nodes/modbus.hpp
@@ -288,6 +288,6 @@ public:
 	const std::string & getDetails();
 };
 
-} /* namespace modbus */
-} /* namespace node */
-} /* namespace villas */
+} // namespace modbus
+} // namespace node
+} // namespace villas
diff --git a/include/villas/nodes/mqtt.hpp b/include/villas/nodes/mqtt.hpp
index 9d683070e..0e5ba87e0 100644
--- a/include/villas/nodes/mqtt.hpp
+++ b/include/villas/nodes/mqtt.hpp
@@ -80,5 +80,5 @@ int mqtt_read(NodeCompat *n, struct Sample * const smps[], unsigned cnt);
 
 int mqtt_write(NodeCompat *n, struct Sample * const smps[], unsigned cnt);
 
-} /* namespace node */
-} /* namespace villas */
+} // namespace node
+} // namespace villas
diff --git a/include/villas/nodes/nanomsg.hpp b/include/villas/nodes/nanomsg.hpp
index 9f0f8abf6..b280a690a 100644
--- a/include/villas/nodes/nanomsg.hpp
+++ b/include/villas/nodes/nanomsg.hpp
@@ -53,5 +53,5 @@ int nanomsg_read(NodeCompat *n, struct Sample * const smps[], unsigned cnt);
 
 int nanomsg_write(NodeCompat *n, struct Sample * const smps[], unsigned cnt);
 
-} /* namespace node */
-} /* namespace villas */
+} // namespace node
+} // namespace villas
diff --git a/include/villas/nodes/ngsi.hpp b/include/villas/nodes/ngsi.hpp
index 33b037076..3202e7382 100644
--- a/include/villas/nodes/ngsi.hpp
+++ b/include/villas/nodes/ngsi.hpp
@@ -74,5 +74,5 @@ int ngsi_write(NodeCompat *n, struct Sample * const smps[], unsigned cnt);
 
 int ngsi_poll_fds(NodeCompat *n, int fds[]);
 
-} /* namespace node */
-} /* namespace villas */
+} // namespace node
+} // namespace villas
diff --git a/include/villas/nodes/opal.hpp b/include/villas/nodes/opal.hpp
index 9e8541b74..ba09adac5 100644
--- a/include/villas/nodes/opal.hpp
+++ b/include/villas/nodes/opal.hpp
@@ -52,5 +52,5 @@ int opal_read(NodeCompat *n, struct Sample * const smps[], unsigned cnt);
 
 int opal_write(NodeCompat *n, struct Sample * const smps[], unsigned cnt);
 
-} /* namespace node */
-} /* namespace villas */
+} // namespace node
+} // namespace villas
diff --git a/include/villas/nodes/redis.hpp b/include/villas/nodes/redis.hpp
index 56744877b..d2cbd0181 100644
--- a/include/villas/nodes/redis.hpp
+++ b/include/villas/nodes/redis.hpp
@@ -120,5 +120,5 @@ int redis_poll_fds(NodeCompat *n, int fds[]);
 
 int redis_netem_fds(NodeCompat *n, int fds[]);
 
-} /* namespace node */
-} /* namespace villas */
+} // namespace node
+} // namespace villas
diff --git a/include/villas/nodes/redis_helpers.hpp b/include/villas/nodes/redis_helpers.hpp
index d35018ed5..be967972c 100644
--- a/include/villas/nodes/redis_helpers.hpp
+++ b/include/villas/nodes/redis_helpers.hpp
@@ -63,7 +63,7 @@ struct hash<sw::redis::ConnectionOptions>
 	}
 };
 
-} /* namespace std */
+} // namespace std
 
 namespace sw {
 namespace redis {
@@ -166,8 +166,8 @@ OStream &operator<<(OStream &os, const ConnectionOptions &o)
 	return os;
 }
 
-} /* namespace redis */
-} /* namespace sw */
+} // namespace redis
+} // namespace sw
 
 template<typename OStream>
 OStream &operator<<(OStream &os, const enum villas::node::RedisMode &m)
diff --git a/include/villas/nodes/rtp.hpp b/include/villas/nodes/rtp.hpp
index f8a7c2e35..1f3c96372 100644
--- a/include/villas/nodes/rtp.hpp
+++ b/include/villas/nodes/rtp.hpp
@@ -109,5 +109,5 @@ int rtp_read(NodeCompat *n, struct Sample * const smps[], unsigned cnt);
 
 int rtp_write(NodeCompat *n, struct Sample * const smps[], unsigned cnt);
 
-} /* namespace node */
-} /* namespace villas */
+} // namespace node
+} // namespace villas
diff --git a/include/villas/nodes/shmem.hpp b/include/villas/nodes/shmem.hpp
index 29da87c40..ae94d446b 100644
--- a/include/villas/nodes/shmem.hpp
+++ b/include/villas/nodes/shmem.hpp
@@ -44,5 +44,5 @@ int shmem_read(NodeCompat *n, struct Sample * const smps[], unsigned cnt);
 
 int shmem_write(NodeCompat *n, struct Sample * const smps[], unsigned cnt);
 
-} /* namespace node */
-} /* namespace villas */
+} // namespace node
+} // namespace villas
diff --git a/include/villas/nodes/signal.hpp b/include/villas/nodes/signal.hpp
index 222be861a..f63dcc328 100644
--- a/include/villas/nodes/signal.hpp
+++ b/include/villas/nodes/signal.hpp
@@ -103,5 +103,5 @@ public:
 	std::vector<int> getPollFDs();
 };
 
-} /* namespace node */
-} /* namespace villas */
+} // namespace node
+} // namespace villas
diff --git a/include/villas/nodes/signal_old.hpp b/include/villas/nodes/signal_old.hpp
index d00cdf423..c0200cf0d 100644
--- a/include/villas/nodes/signal_old.hpp
+++ b/include/villas/nodes/signal_old.hpp
@@ -73,5 +73,5 @@ int signal_node_read(NodeCompat *n, struct Sample * const smps[], unsigned cnt);
 
 int signal_node_poll_fds(NodeCompat *n, int fds[]);
 
-} /* namespace node */
-} /* namespace villas */
+} // namespace node
+} // namespace villas
diff --git a/include/villas/nodes/socket.hpp b/include/villas/nodes/socket.hpp
index d0305ede1..f4fc53539 100644
--- a/include/villas/nodes/socket.hpp
+++ b/include/villas/nodes/socket.hpp
@@ -71,5 +71,5 @@ int socket_parse(NodeCompat *n, json_t *json);
 
 char * socket_print(NodeCompat *n);
 
-} /* namespace node */
-} /* namespace villas */
+} // namespace node
+} // namespace villas
diff --git a/include/villas/nodes/stats.hpp b/include/villas/nodes/stats.hpp
index 7a1538bb9..9b9c45b7b 100644
--- a/include/villas/nodes/stats.hpp
+++ b/include/villas/nodes/stats.hpp
@@ -62,5 +62,5 @@ int stats_node_signal_parse(struct stats_node_signal *s, json_t *json);
 
 int stats_node_poll_fds(NodeCompat *n, int fds[]);
 
-} /* namespace node */
-} /* namespace villas */
+} // namespace node
+} // namespace villas
diff --git a/include/villas/nodes/temper.hpp b/include/villas/nodes/temper.hpp
index e86f35efd..9224b3540 100644
--- a/include/villas/nodes/temper.hpp
+++ b/include/villas/nodes/temper.hpp
@@ -147,5 +147,5 @@ int temper_poll_fds(NodeCompat *n, int fds[]);
 
 int temper_netem_fds(NodeCompat *n, int fds[]);
 
-} /* namespace node */
-} /* namespace villas */
+} // namespace node
+} // namespace villas
diff --git a/include/villas/nodes/test_rtt.hpp b/include/villas/nodes/test_rtt.hpp
index 0986ba8b7..0e357f090 100644
--- a/include/villas/nodes/test_rtt.hpp
+++ b/include/villas/nodes/test_rtt.hpp
@@ -68,5 +68,5 @@ int test_rtt_write(NodeCompat *n, struct Sample * const smps[], unsigned cnt);
 
 int test_rtt_poll_fds(NodeCompat *n, int fds[]);
 
-} /* namespace node */
-} /* namespace villas */
+} // namespace node
+} // namespace villas
diff --git a/include/villas/nodes/uldaq.hpp b/include/villas/nodes/uldaq.hpp
index 8c06d53ba..8378844ca 100644
--- a/include/villas/nodes/uldaq.hpp
+++ b/include/villas/nodes/uldaq.hpp
@@ -72,5 +72,5 @@ int uldaq_stop(NodeCompat *n);
 int uldaq_read(NodeCompat *n, struct Sample * const smps[], unsigned cnt);
 
 
-} /* namespace node */
-} /* namespace villas */
+} // namespace node
+} // namespace villas
diff --git a/include/villas/nodes/webrtc.hpp b/include/villas/nodes/webrtc.hpp
index be853494b..3d7593fd1 100644
--- a/include/villas/nodes/webrtc.hpp
+++ b/include/villas/nodes/webrtc.hpp
@@ -117,5 +117,5 @@ public:
 };
 
 
-} /* namespace node */
-} /* namespace villas */
+} // namespace node
+} // namespace villas
diff --git a/include/villas/nodes/webrtc/peer_connection.hpp b/include/villas/nodes/webrtc/peer_connection.hpp
index bdf374a01..ebbfd42e7 100644
--- a/include/villas/nodes/webrtc/peer_connection.hpp
+++ b/include/villas/nodes/webrtc/peer_connection.hpp
@@ -90,7 +90,7 @@ protected:
 	void onDataChannelMessage(rtc::binary msg);
 };
 
-} /* namespace webrtc */
-} /* namespace node */
-} /* namespace villas */
+} // namespace webrtc
+} // namespace node
+} // namespace villas
 
diff --git a/include/villas/nodes/webrtc/signaling_client.hpp b/include/villas/nodes/webrtc/signaling_client.hpp
index 970d466ba..13e09eccd 100644
--- a/include/villas/nodes/webrtc/signaling_client.hpp
+++ b/include/villas/nodes/webrtc/signaling_client.hpp
@@ -113,7 +113,7 @@ public:
 	}
 };
 
-} /* namespace webrtc */
-} /* namespace node */
-} /* namespace villas */
+} // namespace webrtc
+} // namespace node
+} // namespace villas
 
diff --git a/include/villas/nodes/webrtc/signaling_message.hpp b/include/villas/nodes/webrtc/signaling_message.hpp
index c2e797783..b0d651691 100644
--- a/include/villas/nodes/webrtc/signaling_message.hpp
+++ b/include/villas/nodes/webrtc/signaling_message.hpp
@@ -57,6 +57,6 @@ struct SignalingMessage {
 	std::string toString() const;
 };
 
-} /* namespace webrtc */
-} /* namespace node */
-} /* namespace villas */
+} // namespace webrtc
+} // namespace node
+} // namespace villas
diff --git a/include/villas/nodes/websocket.hpp b/include/villas/nodes/websocket.hpp
index 06501759c..7a3d74017 100644
--- a/include/villas/nodes/websocket.hpp
+++ b/include/villas/nodes/websocket.hpp
@@ -126,5 +126,5 @@ int websocket_read(NodeCompat *n, struct Sample * const smps[], unsigned cnt);
 
 int websocket_write(NodeCompat *n, struct Sample * const smps[], unsigned cnt);
 
-} /* namespace node */
-} /* namespace villas */
+} // namespace node
+} // namespace villas
diff --git a/include/villas/nodes/zeromq.hpp b/include/villas/nodes/zeromq.hpp
index ad3990916..40de65a29 100644
--- a/include/villas/nodes/zeromq.hpp
+++ b/include/villas/nodes/zeromq.hpp
@@ -83,5 +83,5 @@ int zeromq_read(NodeCompat *n, struct Sample * const smps[], unsigned cnt);
 
 int zeromq_write(NodeCompat *n, struct Sample * const smps[], unsigned cnt);
 
-} /* namespace node */
-} /* namespace villas */
+} // namespace node
+} // namespace villas
diff --git a/include/villas/path.hpp b/include/villas/path.hpp
index 9d67fc5b2..3f84f2ac3 100644
--- a/include/villas/path.hpp
+++ b/include/villas/path.hpp
@@ -197,5 +197,5 @@ public:
 	json_t * toJson() const;
 };
 
-} /* namespace node */
-} /* namespace villas */
+} // namespace node
+} // namespace villas
diff --git a/include/villas/path_destination.hpp b/include/villas/path_destination.hpp
index 97d513484..9239c3a00 100644
--- a/include/villas/path_destination.hpp
+++ b/include/villas/path_destination.hpp
@@ -55,5 +55,5 @@ public:
 
 using PathDestinationList = std::vector<PathDestination::Ptr>;
 
-} /* namespace node */
-} /* namespace villas */
+} // namespace node
+} // namespace villas
diff --git a/include/villas/path_list.hpp b/include/villas/path_list.hpp
index 9f7366be4..220c8ebce 100644
--- a/include/villas/path_list.hpp
+++ b/include/villas/path_list.hpp
@@ -30,5 +30,5 @@ public:
 	json_t * toJson() const;
 };
 
-} /* namespace node */
-} /* namespace villas */
+} // namespace node
+} // namespace villas
diff --git a/include/villas/path_source.hpp b/include/villas/path_source.hpp
index 2ea7a0f4f..ea7da31c7 100644
--- a/include/villas/path_source.hpp
+++ b/include/villas/path_source.hpp
@@ -100,5 +100,5 @@ public:
 
 
 
-} /* namespace node */
-} /* namespace villas */
+} // namespace node
+} // namespace villas
diff --git a/include/villas/pool.hpp b/include/villas/pool.hpp
index 46f4dea31..41932a395 100644
--- a/include/villas/pool.hpp
+++ b/include/villas/pool.hpp
@@ -66,5 +66,5 @@ void * pool_get(struct Pool *p);
 /** Release a memory block back to the pool. */
 int pool_put(struct Pool *p, void *buf);
 
-} /* namespace node */
-} /* namespace villas */
+} // namespace node
+} // namespace villas
diff --git a/include/villas/queue.h b/include/villas/queue.h
index a1512ffe4..7906628ed 100644
--- a/include/villas/queue.h
+++ b/include/villas/queue.h
@@ -113,5 +113,5 @@ int queue_pull_many(struct CQueue *q, void *ptr[], size_t cnt);
  */
 int queue_close(struct CQueue *q);
 
-} /* namespace node */
-} /* namespace villas */
+} // namespace node
+} // namespace villas
diff --git a/include/villas/queue.hpp b/include/villas/queue.hpp
index 3e0e15678..3e783b40d 100644
--- a/include/villas/queue.hpp
+++ b/include/villas/queue.hpp
@@ -47,4 +47,4 @@ public:
 
 };
 
-} /* namespace villas */
+} // namespace villas
diff --git a/include/villas/queue_signalled.h b/include/villas/queue_signalled.h
index ba04f4483..6a50ce5a8 100644
--- a/include/villas/queue_signalled.h
+++ b/include/villas/queue_signalled.h
@@ -67,5 +67,5 @@ int queue_signalled_close(struct CQueueSignalled *qs) __attribute__ ((warn_unuse
 /** Returns a file descriptor which can be used with poll / select to wait for new data */
 int queue_signalled_fd(struct CQueueSignalled *qs);
 
-} /* namespace node */
-} /* namespace villas */
+} // namespace node
+} // namespace villas
diff --git a/include/villas/queue_signalled.hpp b/include/villas/queue_signalled.hpp
index fffee36a7..a343181cf 100644
--- a/include/villas/queue_signalled.hpp
+++ b/include/villas/queue_signalled.hpp
@@ -43,4 +43,4 @@ public:
 	}
 };
 
-} /* namespace villas */
+} // namespace villas
diff --git a/include/villas/sample.hpp b/include/villas/sample.hpp
index b52d9ab66..4964476e0 100644
--- a/include/villas/sample.hpp
+++ b/include/villas/sample.hpp
@@ -129,5 +129,5 @@ enum SignalType sample_format(const struct Sample *s, unsigned idx);
 void sample_data_insert(struct Sample *smp, const union SignalData *src, size_t offset, size_t len);
 void sample_data_remove(struct Sample *smp, size_t offset, size_t len);
 
-} /* namespace node */
-} /* namespace villas */
+} // namespace node
+} // namespace villas
diff --git a/include/villas/shmem.hpp b/include/villas/shmem.hpp
index 2a6d7d87e..ebeefe0a3 100644
--- a/include/villas/shmem.hpp
+++ b/include/villas/shmem.hpp
@@ -105,5 +105,5 @@ int shmem_int_alloc(struct ShmemInterface *shm, struct Sample *smps[], unsigned
  * per struct Sample. */
 size_t shmem_total_size(int queuelen, int samplelen);
 
-} /* namespace node */
-} /* namespace villas */
+} // namespace node
+} // namespace villas
diff --git a/include/villas/signal.hpp b/include/villas/signal.hpp
index 962b833d5..e654431ea 100644
--- a/include/villas/signal.hpp
+++ b/include/villas/signal.hpp
@@ -50,5 +50,5 @@ public:
 	bool isNext(const Signal &sig);
 };
 
-} /* namespace node */
-} /* namespace villas */
+} // namespace node
+} // namespace villas
diff --git a/include/villas/signal_data.hpp b/include/villas/signal_data.hpp
index 3aef644e4..be6c91169 100644
--- a/include/villas/signal_data.hpp
+++ b/include/villas/signal_data.hpp
@@ -65,5 +65,5 @@ union SignalData {
 	std::string toString(enum SignalType type, int precision = 5) const;
 };
 
-} /* namespace node */
-} /* namespace villas */
+} // namespace node
+} // namespace villas
diff --git a/include/villas/signal_list.hpp b/include/villas/signal_list.hpp
index 22322e2a2..77f34b06e 100644
--- a/include/villas/signal_list.hpp
+++ b/include/villas/signal_list.hpp
@@ -50,5 +50,5 @@ public:
 	Signal::Ptr getByIndex(unsigned idx);
 };
 
-} /* namespace node */
-} /* namespace villas */
+} // namespace node
+} // namespace villas
diff --git a/include/villas/signal_type.hpp b/include/villas/signal_type.hpp
index a037aa2d8..e606eba8f 100644
--- a/include/villas/signal_type.hpp
+++ b/include/villas/signal_type.hpp
@@ -29,5 +29,5 @@ std::string signalTypeToString(enum SignalType fmt);
 
 enum SignalType signalTypeDetect(const std::string &val);
 
-} /* namespace node */
-} /* namespace villas */
+} // namespace node
+} // namespace villas
diff --git a/include/villas/socket_addr.hpp b/include/villas/socket_addr.hpp
index 7d0bb8a49..f7312e987 100644
--- a/include/villas/socket_addr.hpp
+++ b/include/villas/socket_addr.hpp
@@ -71,5 +71,5 @@ int socket_parse_address(const char *str, struct sockaddr *sa, enum SocketLayer
 
 int socket_compare_addr(struct sockaddr *x, struct sockaddr *y);
 
-} /* namespace node */
-} /* namespace villas */
+} // namespace node
+} // namespace villas
diff --git a/include/villas/stats.hpp b/include/villas/stats.hpp
index f57948002..18d0671cb 100644
--- a/include/villas/stats.hpp
+++ b/include/villas/stats.hpp
@@ -123,4 +123,4 @@ public:
 	static std::vector<TableColumn> columns;
 };
 
-} /* namespace villas */
+} // namespace villas
diff --git a/include/villas/super_node.hpp b/include/villas/super_node.hpp
index 806e1bc81..7711420e4 100644
--- a/include/villas/super_node.hpp
+++ b/include/villas/super_node.hpp
@@ -194,5 +194,5 @@ public:
 	~SuperNode();
 };
 
-} /* namespace node */
-} /* namespace villas */
+} // namespace node
+} // namespace villas
diff --git a/include/villas/usb.hpp b/include/villas/usb.hpp
index ffa72b170..9ff70e184 100644
--- a/include/villas/usb.hpp
+++ b/include/villas/usb.hpp
@@ -108,5 +108,5 @@ struct libusb_context * get_context();
 
 void detach(struct libusb_device_handle *hdl, int iface);
 
-} /* namespace usb */
-} /* namespace villas */
+} // namespace usb
+} // namespace villas
diff --git a/include/villas/web.hpp b/include/villas/web.hpp
index 2129fa738..64f43dc45 100644
--- a/include/villas/web.hpp
+++ b/include/villas/web.hpp
@@ -95,5 +95,5 @@ public:
 	}
 };
 
-} /* namespace node */
-} /* namespace villas */
+} // namespace node
+} // namespace villas
diff --git a/lib/api/requests/capabiltities.cpp b/lib/api/requests/capabiltities.cpp
index 81bb14852..cf0a494c2 100644
--- a/lib/api/requests/capabiltities.cpp
+++ b/lib/api/requests/capabiltities.cpp
@@ -38,6 +38,6 @@ static char r[] = "/capabilities";
 static char d[] = "get capabiltities and details about this VILLASnode instance";
 static RequestPlugin<CapabilitiesRequest, n, r, d> p;
 
-} /* namespace api */
-} /* namespace node */
-} /* namespace villas */
+} // namespace api
+} // namespace node
+} // namespace villas
diff --git a/lib/api/requests/config.cpp b/lib/api/requests/config.cpp
index 41fb1a0fc..c341402ac 100644
--- a/lib/api/requests/config.cpp
+++ b/lib/api/requests/config.cpp
@@ -43,6 +43,6 @@ static char r[] = "/config";
 static char d[] = "get configuration of this VILLASnode instance";
 static RequestPlugin<ConfigRequest, n, r, d> p;
 
-} /* namespace api */
-} /* namespace node */
-} /* namespace villas */
+} // namespace api
+} // namespace node
+} // namespace villas
diff --git a/lib/api/requests/graph.cpp b/lib/api/requests/graph.cpp
index 9513accf7..963a00292 100644
--- a/lib/api/requests/graph.cpp
+++ b/lib/api/requests/graph.cpp
@@ -113,7 +113,7 @@ static char r[] = "/graph\\.([a-z]+)";
 static char d[] = "get graph representation of configuration";
 static RequestPlugin<GraphRequest, n, r, d> p;
 
-} /* namespace api */
-} /* namespace node */
-} /* namespace villas */
+} // namespace api
+} // namespace node
+} // namespace villas
 
diff --git a/lib/api/requests/node_action.cpp b/lib/api/requests/node_action.cpp
index 8df3fc01f..eff4b24dc 100644
--- a/lib/api/requests/node_action.cpp
+++ b/lib/api/requests/node_action.cpp
@@ -71,6 +71,6 @@ static char d5[] = "restart a node";
 static RequestPlugin<NodeActionRequest<&Node::restart>, n5, r5, d5> p5;
 
 
-} /* namespace api */
-} /* namespace node */
-} /* namespace villas */
+} // namespace api
+} // namespace node
+} // namespace villas
diff --git a/lib/api/requests/node_file.cpp b/lib/api/requests/node_file.cpp
index 67503fa17..2ecc6c661 100644
--- a/lib/api/requests/node_file.cpp
+++ b/lib/api/requests/node_file.cpp
@@ -54,6 +54,6 @@ static char r[] = "/node/(" RE_NODE_NAME "|" RE_UUID ")/file(?:/([^/]+))?";
 static char d[] = "control instances of 'file' node-type";
 static RequestPlugin<FileRequest, n, r, d> p;
 
-} /* namespace api */
-} /* namespace node */
-} /* namespace villas */
+} // namespace api
+} // namespace node
+} // namespace villas
diff --git a/lib/api/requests/node_info.cpp b/lib/api/requests/node_info.cpp
index d99f22374..9b31b8170 100644
--- a/lib/api/requests/node_info.cpp
+++ b/lib/api/requests/node_info.cpp
@@ -51,6 +51,6 @@ static char r[] = "/node/(" RE_NODE_NAME "|" RE_UUID ")";
 static char d[] = "retrieve info of a node";
 static RequestPlugin<NodeInfoRequest, n, r, d> p;
 
-} /* namespace api */
-} /* namespace node */
-} /* namespace villas */
+} // namespace api
+} // namespace node
+} // namespace villas
diff --git a/lib/api/requests/node_stats.cpp b/lib/api/requests/node_stats.cpp
index 55d38092e..086ba4d10 100644
--- a/lib/api/requests/node_stats.cpp
+++ b/lib/api/requests/node_stats.cpp
@@ -46,6 +46,6 @@ static char r[] = "/node/(" RE_NODE_NAME "|" RE_UUID ")/stats";
 static char d[] = "get internal statistics counters";
 static RequestPlugin<StatsRequest, n, r, d> p;
 
-} /* namespace api */
-} /* namespace node */
-} /* namespace villas */
+} // namespace api
+} // namespace node
+} // namespace villas
diff --git a/lib/api/requests/node_stats_reset.cpp b/lib/api/requests/node_stats_reset.cpp
index 57c3017c9..889d68dde 100644
--- a/lib/api/requests/node_stats_reset.cpp
+++ b/lib/api/requests/node_stats_reset.cpp
@@ -48,6 +48,6 @@ static char r[] = "/node/(" RE_NODE_NAME "|" RE_UUID ")/stats/reset";
 static char d[] = "reset internal statistics counters";
 static RequestPlugin<StatsRequest, n, r, d> p;
 
-} /* namespace api */
-} /* namespace node */
-} /* namespace villas */
+} // namespace api
+} // namespace node
+} // namespace villas
diff --git a/lib/api/requests/nodes.cpp b/lib/api/requests/nodes.cpp
index bc4c563c1..167d3c866 100644
--- a/lib/api/requests/nodes.cpp
+++ b/lib/api/requests/nodes.cpp
@@ -44,6 +44,6 @@ static char r[] = "/nodes";
 static char d[] = "retrieve list of all known nodes";
 static RequestPlugin<NodesRequest, n, r, d> p;
 
-} /* namespace api */
-} /* namespace node */
-} /* namespace villas */
+} // namespace api
+} // namespace node
+} // namespace villas
diff --git a/lib/api/requests/path_action.cpp b/lib/api/requests/path_action.cpp
index 296a36b2c..30cb7957e 100644
--- a/lib/api/requests/path_action.cpp
+++ b/lib/api/requests/path_action.cpp
@@ -52,6 +52,6 @@ static char d2[] = "stop a path";
 static RequestPlugin<PathActionRequest<&Path::stop>, n2, r2, d2> p2;
 
 
-} /* namespace api */
-} /* namespace node */
-} /* namespace villas */
+} // namespace api
+} // namespace node
+} // namespace villas
diff --git a/lib/api/requests/path_info.cpp b/lib/api/requests/path_info.cpp
index 36c709264..ad3f8549f 100644
--- a/lib/api/requests/path_info.cpp
+++ b/lib/api/requests/path_info.cpp
@@ -42,6 +42,6 @@ static char r[] = "/path/(" RE_UUID ")";
 static char d[] = "retrieve info of a path";
 static RequestPlugin<PathInfoRequest, n, r, d> p;
 
-} /* namespace api */
-} /* namespace node */
-} /* namespace villas */
+} // namespace api
+} // namespace node
+} // namespace villas
diff --git a/lib/api/requests/paths.cpp b/lib/api/requests/paths.cpp
index f38aba7e7..7ee255641 100644
--- a/lib/api/requests/paths.cpp
+++ b/lib/api/requests/paths.cpp
@@ -44,6 +44,6 @@ static char r[] = "/paths";
 static char d[] = "retrieve list of all paths with details";
 static RequestPlugin<PathsRequest, n, r, d> p;
 
-} /* namespace api */
-} /* namespace node */
-} /* namespace villas */
+} // namespace api
+} // namespace node
+} // namespace villas
diff --git a/lib/api/requests/restart.cpp b/lib/api/requests/restart.cpp
index 29a150fd3..2fa383ede 100644
--- a/lib/api/requests/restart.cpp
+++ b/lib/api/requests/restart.cpp
@@ -124,7 +124,7 @@ static char r[] = "/restart";
 static char d[] = "restart VILLASnode with new configuration";
 static RequestPlugin<RestartRequest, n, r, d> p;
 
-} /* namespace api */
-} /* namespace node */
-} /* namespace villas */
+} // namespace api
+} // namespace node
+} // namespace villas
 
diff --git a/lib/api/requests/shutdown.cpp b/lib/api/requests/shutdown.cpp
index 6ffb8890b..60b24b3d2 100644
--- a/lib/api/requests/shutdown.cpp
+++ b/lib/api/requests/shutdown.cpp
@@ -40,6 +40,6 @@ static char r[] = "/shutdown";
 static char d[] = "quit VILLASnode";
 static RequestPlugin<ShutdownRequest, n, r, d> p;
 
-} /* namespace api */
-} /* namespace node */
-} /* namespace villas */
+} // namespace api
+} // namespace node
+} // namespace villas
diff --git a/lib/api/requests/status.cpp b/lib/api/requests/status.cpp
index 83925d20a..74be93763 100644
--- a/lib/api/requests/status.cpp
+++ b/lib/api/requests/status.cpp
@@ -114,7 +114,7 @@ static char r[] = "/status";
 static char d[] = "get status and statistics of web server";
 static RequestPlugin<StatusRequest, n, r, d> p;
 
-} /* namespace api */
-} /* namespace node */
-} /* namespace villas */
+} // namespace api
+} // namespace node
+} // namespace villas
 
diff --git a/lib/api/requests/universal/channel.cpp b/lib/api/requests/universal/channel.cpp
index 060a1ebea..d8b1a971b 100644
--- a/lib/api/requests/universal/channel.cpp
+++ b/lib/api/requests/universal/channel.cpp
@@ -157,7 +157,7 @@ static char r[] = "/universal/(" RE_NODE_NAME ")/channel/([a-z0-9_-]+)/(sample|e
 static char d[] = "retrieve or send samples via universal data-exchange API";
 static RequestPlugin<ChannelRequest, n, r, d> p;
 
-} /* namespace universal */
-} /* namespace api */
-} /* namespace node */
-} /* namespace villas */
+} // namespace universal
+} // namespace api
+} // namespace node
+} // namespace villas
diff --git a/lib/api/requests/universal/channels.cpp b/lib/api/requests/universal/channels.cpp
index e835a0bba..576a9216f 100644
--- a/lib/api/requests/universal/channels.cpp
+++ b/lib/api/requests/universal/channels.cpp
@@ -54,7 +54,7 @@ static char r[] = "/universal/(" RE_NODE_NAME ")/channels";
 static char d[] = "get channels of universal data-exchange API node";
 static RequestPlugin<SignalsRequest, n, r, d> p;
 
-} /* namespace universal */
-} /* namespace api */
-} /* namespace node */
-} /* namespace villas */
+} // namespace universal
+} // namespace api
+} // namespace node
+} // namespace villas
diff --git a/lib/api/requests/universal/info.cpp b/lib/api/requests/universal/info.cpp
index 053207bce..efbc46023 100644
--- a/lib/api/requests/universal/info.cpp
+++ b/lib/api/requests/universal/info.cpp
@@ -47,7 +47,7 @@ static char r[] = "/universal/(" RE_NODE_NAME ")/info";
 static char d[] = "get infos of universal data-exchange API";
 static RequestPlugin<InfoRequest, n, r, d> p;
 
-} /* namespace universal */
-} /* namespace api */
-} /* namespace node */
-} /* namespace villas */
+} // namespace universal
+} // namespace api
+} // namespace node
+} // namespace villas
diff --git a/lib/api/requests/universal/status.cpp b/lib/api/requests/universal/status.cpp
index 0270cbad3..222681e4c 100644
--- a/lib/api/requests/universal/status.cpp
+++ b/lib/api/requests/universal/status.cpp
@@ -41,7 +41,7 @@ static char r[] = "/universal/(" RE_NODE_NAME ")/status";
 static char d[] = "get status of universal data-exchange API";
 static RequestPlugin<StatusRequest, n, r, d> p;
 
-} /* namespace universal */
-} /* namespace api */
-} /* namespace node */
-} /* namespace villas */
+} // namespace universal
+} // namespace api
+} // namespace node
+} // namespace villas
diff --git a/lib/hooks/average.cpp b/lib/hooks/average.cpp
index 5a517a29b..db8d6bd6f 100644
--- a/lib/hooks/average.cpp
+++ b/lib/hooks/average.cpp
@@ -103,5 +103,5 @@ static char n[] = "average";
 static char d[] = "Calculate average over some signals";
 static HookPlugin<AverageHook, n , d, (int) Hook::Flags::PATH | (int) Hook::Flags::NODE_READ | (int) Hook::Flags::NODE_WRITE> p;
 
-} /* namespace node */
-} /* namespace villas */
+} // namespace node
+} // namespace villas
diff --git a/lib/hooks/cast.cpp b/lib/hooks/cast.cpp
index 73e41ff6a..6dfe0179f 100644
--- a/lib/hooks/cast.cpp
+++ b/lib/hooks/cast.cpp
@@ -105,6 +105,6 @@ static char n[] = "cast";
 static char d[] = "Cast signals types";
 static HookPlugin<CastHook, n, d, (int) Hook::Flags::NODE_READ | (int) Hook::Flags::PATH> p;
 
-} /* namespace node */
-} /* namespace villas */
+} // namespace node
+} // namespace villas
 
diff --git a/lib/hooks/decimate.cpp b/lib/hooks/decimate.cpp
index 9bea7d24d..e6c397400 100644
--- a/lib/hooks/decimate.cpp
+++ b/lib/hooks/decimate.cpp
@@ -57,5 +57,5 @@ static char n[] = "decimate";
 static char d[] = "Downsamping by integer factor";
 static HookPlugin<DecimateHook, n, d, (int) Hook::Flags::NODE_READ | (int) Hook::Flags::NODE_WRITE | (int) Hook::Flags::PATH> p;
 
-} /* namespace node */
-} /* namespace villas */
+} // namespace node
+} // namespace villas
diff --git a/lib/hooks/dp.cpp b/lib/hooks/dp.cpp
index c7d0b42b6..010c77f24 100644
--- a/lib/hooks/dp.cpp
+++ b/lib/hooks/dp.cpp
@@ -297,5 +297,5 @@ static char n[] = "dp";
 static char d[] = "Transform to/from dynamic phasor domain";
 static HookPlugin<DPHook, n, d, (int) Hook::Flags::PATH | (int) Hook::Flags::NODE_READ | (int) Hook::Flags::NODE_WRITE> p;
 
-} /* namespace node */
-} /* namespace villas */
+} // namespace node
+} // namespace villas
diff --git a/lib/hooks/drop.cpp b/lib/hooks/drop.cpp
index 89bd594de..0ea53ca65 100644
--- a/lib/hooks/drop.cpp
+++ b/lib/hooks/drop.cpp
@@ -80,5 +80,5 @@ static char n[] = "drop";
 static char d[] = "Drop messages with reordered sequence numbers";
 static HookPlugin<DropHook, n, d, (int) Hook::Flags::BUILTIN | (int) Hook::Flags::NODE_READ, 3> p;
 
-} /* namespace node */
-} /* namespace villas */
+} // namespace node
+} // namespace villas
diff --git a/lib/hooks/dump.cpp b/lib/hooks/dump.cpp
index c8b3ebcdb..4571707eb 100644
--- a/lib/hooks/dump.cpp
+++ b/lib/hooks/dump.cpp
@@ -31,5 +31,5 @@ static char n[] = "dump";
 static char d[] = "Dump data to stdout";
 static HookPlugin<DumpHook, n, d, (int) Hook::Flags::NODE_READ | (int) Hook::Flags::NODE_WRITE | (int) Hook::Flags::PATH, 1> p;
 
-} /* namespace node */
-} /* namespace villas */
+} // namespace node
+} // namespace villas
diff --git a/lib/hooks/ebm.cpp b/lib/hooks/ebm.cpp
index 2eda91353..f2d054f40 100644
--- a/lib/hooks/ebm.cpp
+++ b/lib/hooks/ebm.cpp
@@ -109,5 +109,5 @@ static char n[] = "ebm";
 static char d[] = "Energy-based Metric";
 static HookPlugin<EBMHook, n, d, (int) Hook::Flags::PATH | (int) Hook::Flags::NODE_READ | (int) Hook::Flags::NODE_WRITE> p;
 
-} /* namespace node */
-} /* namespace villas */
+} // namespace node
+} // namespace villas
diff --git a/lib/hooks/fix.cpp b/lib/hooks/fix.cpp
index 5d9f6affd..5e50ffc60 100644
--- a/lib/hooks/fix.cpp
+++ b/lib/hooks/fix.cpp
@@ -50,6 +50,6 @@ static char n[] = "fix";
 static char d[] = "Fix received data by adding missing fields";
 static HookPlugin<FixHook, n, d, (int) Hook::Flags::BUILTIN | (int) Hook::Flags::NODE_READ, 1> p;
 
-} /* namespace node */
-} /* namespace villas */
+} // namespace node
+} // namespace villas
 
diff --git a/lib/hooks/gate.cpp b/lib/hooks/gate.cpp
index b4ed6e651..cd4ae43b1 100644
--- a/lib/hooks/gate.cpp
+++ b/lib/hooks/gate.cpp
@@ -155,5 +155,5 @@ static char n[] = "gate";
 static char d[] = "Skip samples only if an enable signal is under a specified threshold";
 static HookPlugin<GateHook, n, d, (int) Hook::Flags::NODE_READ | (int) Hook::Flags::PATH> p;
 
-} /* namespace node */
-} /* namespace villas */
+} // namespace node
+} // namespace villas
diff --git a/lib/hooks/jitter_calc.cpp b/lib/hooks/jitter_calc.cpp
index efbff88b0..d32b047c2 100644
--- a/lib/hooks/jitter_calc.cpp
+++ b/lib/hooks/jitter_calc.cpp
@@ -97,5 +97,5 @@ static char n[] = "jitter_calc";
 static char d[] = "Calc jitter, mean and variance of GPS vs NTP TS";
 static HookPlugin<JitterCalcHook, n, d, (int) Hook::Flags::NODE_READ | (int) Hook::Flags::PATH, 0> p;
 
-} /* namespace node */
-} /* namespace villas */
+} // namespace node
+} // namespace villas
diff --git a/lib/hooks/limit_rate.cpp b/lib/hooks/limit_rate.cpp
index ef45704a9..e07fe7909 100644
--- a/lib/hooks/limit_rate.cpp
+++ b/lib/hooks/limit_rate.cpp
@@ -81,5 +81,5 @@ static char n[] = "limit_rate";
 static char d[] = "Limit sending rate";
 static HookPlugin<LimitRateHook, n, d, (int) Hook::Flags::NODE_READ | (int) Hook::Flags::NODE_WRITE | (int) Hook::Flags::PATH> p;
 
-} /* namespace node */
-} /* namespace villas */
+} // namespace node
+} // namespace villas
diff --git a/lib/hooks/limit_value.cpp b/lib/hooks/limit_value.cpp
index 0a66d61e7..7b23512b1 100644
--- a/lib/hooks/limit_value.cpp
+++ b/lib/hooks/limit_value.cpp
@@ -89,5 +89,5 @@ static char n[] = "limit_value";
 static char d[] = "Limit signal values";
 static HookPlugin<LimitValueHook, n , d, (int) Hook::Flags::PATH | (int) Hook::Flags::NODE_READ | (int) Hook::Flags::NODE_WRITE> p;
 
-} /* namespace node */
-} /* namespace villas */
+} // namespace node
+} // namespace villas
diff --git a/lib/hooks/lua.cpp b/lib/hooks/lua.cpp
index eddce457c..d75392cd2 100644
--- a/lib/hooks/lua.cpp
+++ b/lib/hooks/lua.cpp
@@ -773,5 +773,5 @@ static char n[] = "lua";
 static char d[] = "Implement hook functions or expressions in Lua";
 static HookPlugin<LuaHook, n, d, (int) Hook::Flags::NODE_READ | (int) Hook::Flags::NODE_WRITE | (int) Hook::Flags::PATH, 1> p;
 
-} /* namespace node */
-} /* namespace villas */
+} // namespace node
+} // namespace villas
diff --git a/lib/hooks/ma.cpp b/lib/hooks/ma.cpp
index f877b631d..baf507f21 100644
--- a/lib/hooks/ma.cpp
+++ b/lib/hooks/ma.cpp
@@ -105,5 +105,5 @@ static char n[] = "ma";
 static char d[] = "A simple moving average filter over a fixed number of past samples";
 static HookPlugin<MovingAverageHook, n, d, (int) Hook::Flags::NODE_READ | (int) Hook::Flags::NODE_WRITE | (int) Hook::Flags::PATH> p;
 
-} /* namespace node */
-} /* namespace villas */
+} // namespace node
+} // namespace villas
diff --git a/lib/hooks/pmu.cpp b/lib/hooks/pmu.cpp
index f5915aadb..491b6f004 100644
--- a/lib/hooks/pmu.cpp
+++ b/lib/hooks/pmu.cpp
@@ -247,5 +247,5 @@ static char n[] = "pmu";
 static char d[] = "This hook estimates a phsor";
 static HookPlugin<PmuHook, n, d, (int) Hook::Flags::NODE_READ | (int) Hook::Flags::NODE_WRITE | (int) Hook::Flags::PATH> p;
 
-} /* namespace node */
-} /* namespace villas */
+} // namespace node
+} // namespace villas
diff --git a/lib/hooks/pmu_dft.cpp b/lib/hooks/pmu_dft.cpp
index 086b1f21a..a5c0118bf 100644
--- a/lib/hooks/pmu_dft.cpp
+++ b/lib/hooks/pmu_dft.cpp
@@ -168,7 +168,7 @@ public:
 		phasorPhase(dumperPrefix + "phasorPhase"),
 		phasorAmplitude(dumperPrefix + "phasorAmplitude"),
 		phasorFreq(dumperPrefix + "phasorFreq"),
-#endif		
+#endif
 		angleUnitFactor(1),
 		phaseOffset(0.0),
 		frequencyOffset(0.0),
@@ -671,5 +671,5 @@ static char n[] = "pmu_dft";
 static char d[] = "This hook calculates the  dft on a window";
 static HookPlugin<PmuDftHook, n, d, (int) Hook::Flags::NODE_READ | (int) Hook::Flags::NODE_WRITE | (int) Hook::Flags::PATH> p;
 
-} /* namespace node */
-} /* namespace villas */
+} // namespace node
+} // namespace villas
diff --git a/lib/hooks/pmu_ipdft.cpp b/lib/hooks/pmu_ipdft.cpp
index a235634f2..99a3a8c44 100644
--- a/lib/hooks/pmu_ipdft.cpp
+++ b/lib/hooks/pmu_ipdft.cpp
@@ -154,5 +154,5 @@ static char n[] = "ip-dft-pmu";
 static char d[] = "This hook calculates a phasor based on ipDFT";
 static HookPlugin<IpDftPmuHook, n, d, (int) Hook::Flags::NODE_READ | (int) Hook::Flags::NODE_WRITE | (int) Hook::Flags::PATH> p;
 
-} /* namespace node */
-} /* namespace villas */
+} // namespace node
+} // namespace villas
diff --git a/lib/hooks/power.cpp b/lib/hooks/power.cpp
index f1540c746..414fe5b49 100644
--- a/lib/hooks/power.cpp
+++ b/lib/hooks/power.cpp
@@ -331,5 +331,5 @@ static char n[] = "power";
 static char d[] = "This hook calculates the Active and Reactive Power for a given signal ";
 static HookPlugin<PowerHook, n, d, (int)Hook::Flags::NODE_READ | (int)Hook::Flags::NODE_WRITE | (int)Hook::Flags::PATH> p;
 
-} /* namespace node */
-} /* namespace villas */
+} // namespace node
+} // namespace villas
diff --git a/lib/hooks/pps_ts.cpp b/lib/hooks/pps_ts.cpp
index 6bf969e12..b2541e37c 100644
--- a/lib/hooks/pps_ts.cpp
+++ b/lib/hooks/pps_ts.cpp
@@ -224,5 +224,5 @@ static char n[] = "pps_ts";
 static char d[] = "Timestamp samples based GPS PPS signal";
 static HookPlugin<PpsTsHook, n, d, (int) Hook::Flags::NODE_READ | (int) Hook::Flags::NODE_WRITE | (int) Hook::Flags::PATH> p;
 
-} /* namespace node */
-} /* namespace villas */
+} // namespace node
+} // namespace villas
diff --git a/lib/hooks/print.cpp b/lib/hooks/print.cpp
index 7467cb29f..e93de76e0 100644
--- a/lib/hooks/print.cpp
+++ b/lib/hooks/print.cpp
@@ -136,6 +136,6 @@ static char n[] = "print";
 static char d[] = "Print the message to stdout or a file";
 static HookPlugin<PrintHook, n, d, (int) Hook::Flags::NODE_READ | (int) Hook::Flags::NODE_WRITE | (int) Hook::Flags::PATH> p;
 
-} /* namespace node */
-} /* namespace villas */
+} // namespace node
+} // namespace villas
 
diff --git a/lib/hooks/restart.cpp b/lib/hooks/restart.cpp
index 4ec1f6fca..5aad7d077 100644
--- a/lib/hooks/restart.cpp
+++ b/lib/hooks/restart.cpp
@@ -77,5 +77,5 @@ static char n[] = "restart";
 static char d[] = "Call restart hooks for current node";
 static HookPlugin<RestartHook, n, d, (int) Hook::Flags::BUILTIN | (int) Hook::Flags::NODE_READ, 1> p;
 
-} /* namespace node */
-} /* namespace villas */
+} // namespace node
+} // namespace villas
diff --git a/lib/hooks/rms.cpp b/lib/hooks/rms.cpp
index 993d4d8fc..f33efbaea 100644
--- a/lib/hooks/rms.cpp
+++ b/lib/hooks/rms.cpp
@@ -114,5 +114,5 @@ static char n[] = "rms";
 static char d[] = "This hook calculates the root-mean-square (RMS) on a window";
 static HookPlugin<RMSHook, n, d, (int) Hook::Flags::NODE_READ | (int) Hook::Flags::NODE_WRITE | (int) Hook::Flags::PATH> p;
 
-} /* namespace node */
-} /* namespace villas */
+} // namespace node
+} // namespace villas
diff --git a/lib/hooks/round.cpp b/lib/hooks/round.cpp
index 825e7b3ee..49ea6f2f0 100644
--- a/lib/hooks/round.cpp
+++ b/lib/hooks/round.cpp
@@ -72,5 +72,5 @@ static char n[] = "round";
 static char d[] = "Round signals to a set number of digits";
 static HookPlugin<RoundHook, n, d, (int) Hook::Flags::PATH | (int) Hook::Flags::NODE_READ | (int) Hook::Flags::NODE_WRITE> p;
 
-} /* namespace node */
-} /* namespace villas */
+} // namespace node
+} // namespace villas
diff --git a/lib/hooks/scale.cpp b/lib/hooks/scale.cpp
index 06e99564f..d9daa6c3c 100644
--- a/lib/hooks/scale.cpp
+++ b/lib/hooks/scale.cpp
@@ -80,5 +80,5 @@ static char n[] = "scale";
 static char d[] = "Scale signals by a factor and add offset";
 static HookPlugin<ScaleHook, n, d, (int) Hook::Flags::PATH | (int) Hook::Flags::NODE_READ | (int) Hook::Flags::NODE_WRITE> p;
 
-} /* namespace node */
-} /* namespace villas */
+} // namespace node
+} // namespace villas
diff --git a/lib/hooks/shift_seq.cpp b/lib/hooks/shift_seq.cpp
index 90e4c046a..a56797b88 100644
--- a/lib/hooks/shift_seq.cpp
+++ b/lib/hooks/shift_seq.cpp
@@ -53,5 +53,5 @@ static char n[] = "shift_seq";
 static char d[] = "Shift sequence number of samples";
 static HookPlugin<ShiftSequenceHook, n, d, (int) Hook::Flags::NODE_READ | (int) Hook::Flags::PATH> p;
 
-} /* namespace node */
-} /* namespace villas */
+} // namespace node
+} // namespace villas
diff --git a/lib/hooks/shift_ts.cpp b/lib/hooks/shift_ts.cpp
index f0ffa2235..55b6e2f69 100644
--- a/lib/hooks/shift_ts.cpp
+++ b/lib/hooks/shift_ts.cpp
@@ -91,5 +91,5 @@ static char n[] = "shift_ts";
 static char d[] = "Shift timestamps of samples";
 static HookPlugin<ShiftTimestampHook, n, d, (int) Hook::Flags::NODE_READ | (int) Hook::Flags::PATH> p;
 
-} /* namespace node */
-} /* namespace villas */
+} // namespace node
+} // namespace villas
diff --git a/lib/hooks/skip_first.cpp b/lib/hooks/skip_first.cpp
index 1994e6ce2..4bff92e76 100644
--- a/lib/hooks/skip_first.cpp
+++ b/lib/hooks/skip_first.cpp
@@ -126,5 +126,5 @@ static char n[] = "skip_first";
 static char d[] = "Skip the first samples";
 static HookPlugin<SkipFirstHook, n, d, (int) Hook::Flags::NODE_READ | (int) Hook::Flags::NODE_WRITE | (int) Hook::Flags::PATH> p;
 
-} /* namespace node */
-} /* namespace villas */
+} // namespace node
+} // namespace villas
diff --git a/lib/hooks/stats.cpp b/lib/hooks/stats.cpp
index 4e17c458e..801c1784b 100644
--- a/lib/hooks/stats.cpp
+++ b/lib/hooks/stats.cpp
@@ -263,6 +263,6 @@ static char n[] = "stats";
 static char d[] = "Collect statistics for the current node";
 static HookPlugin<StatsHook, n, d, (int) Hook::Flags::NODE_READ> p;
 
-} /* namespace node */
-} /* namespace villas */
+} // namespace node
+} // namespace villas
 
diff --git a/lib/hooks/ts.cpp b/lib/hooks/ts.cpp
index 659287771..bfe8ec548 100644
--- a/lib/hooks/ts.cpp
+++ b/lib/hooks/ts.cpp
@@ -32,5 +32,5 @@ static char n[] = "ts";
 static char d[] = "Overwrite origin timestamp of samples with receive timestamp";
 static HookPlugin<TsHook, n, d, (int) Hook::Flags::NODE_READ | (int) Hook::Flags::NODE_WRITE | (int) Hook::Flags::PATH> p;
 
-} /* namespace node */
-} /* namespace villas */
+} // namespace node
+} // namespace villas
diff --git a/plugins/example_hook.cpp b/plugins/example_hook.cpp
index eada31936..fc96abdeb 100644
--- a/plugins/example_hook.cpp
+++ b/plugins/example_hook.cpp
@@ -27,5 +27,5 @@ static char n[] = "example";
 static char d[] = "This is just a simple example hook";
 static HookPlugin<ExampleHook, n, d, (int) Hook::Flags::PATH> p;
 
-} /* namespace node */
-} /* namespace villas */
+} // namespace node
+} // namespace villas
diff --git a/src/villas-compare.cpp b/src/villas-compare.cpp
index 7aff485bc..7006f946b 100644
--- a/src/villas-compare.cpp
+++ b/src/villas-compare.cpp
@@ -266,9 +266,9 @@ out:		for (auto side : sides)
 	}
 };
 
-} /* namespace tools */
-} /* namespace node */
-} /* namespace villas */
+} // namespace tools
+} // namespace node
+} // namespace villas
 
 int main(int argc, char *argv[])
 {
diff --git a/src/villas-conf2json.cpp b/src/villas-conf2json.cpp
index d21fd3e90..a0e3d4cac 100644
--- a/src/villas-conf2json.cpp
+++ b/src/villas-conf2json.cpp
@@ -78,9 +78,9 @@ protected:
 	}
 };
 
-} /* namespace tools */
-} /* namespace node */
-} /* namespace villas */
+} // namespace tools
+} // namespace node
+} // namespace villas
 
 int main(int argc, char *argv[])
 {
diff --git a/src/villas-convert.cpp b/src/villas-convert.cpp
index 610bd6e11..aa9969895 100644
--- a/src/villas-convert.cpp
+++ b/src/villas-convert.cpp
@@ -161,9 +161,9 @@ protected:
 	}
 };
 
-} /* namespace tools */
-} /* namespace node */
-} /* namespace villas */
+} // namespace tools
+} // namespace node
+} // namespace villas
 
 int main(int argc, char *argv[])
 {
diff --git a/src/villas-graph.cpp b/src/villas-graph.cpp
index 8b833e175..ffd4a29fe 100644
--- a/src/villas-graph.cpp
+++ b/src/villas-graph.cpp
@@ -126,9 +126,9 @@ protected:
 	}
 };
 
-} /* namespace tools */
-} /* namespace node */
-} /* namespace villas */
+} // namespace tools
+} // namespace node
+} // namespace villas
 
 int main(int argc, char *argv[])
 {
diff --git a/src/villas-hook.cpp b/src/villas-hook.cpp
index b5ef0501a..30c1797dd 100644
--- a/src/villas-hook.cpp
+++ b/src/villas-hook.cpp
@@ -310,9 +310,9 @@ stop:			sent = output->print(stdout, smps, send);
 	}
 };
 
-} /* namespace tools */
-} /* namespace node */
-} /* namespace villas */
+} // namespace tools
+} // namespace node
+} // namespace villas
 
 int main(int argc, char *argv[])
 {
diff --git a/src/villas-pipe.cpp b/src/villas-pipe.cpp
index 822caf22d..9e8d6db76 100644
--- a/src/villas-pipe.cpp
+++ b/src/villas-pipe.cpp
@@ -510,9 +510,9 @@ check:			if (optarg == endptr)
 };
 
 
-} /* namespace tools */
-} /* namespace node */
-} /* namespace villas */
+} // namespace tools
+} // namespace node
+} // namespace villas
 
 int main(int argc, char *argv[])
 {
diff --git a/src/villas-relay.cpp b/src/villas-relay.cpp
index a4436fe20..6f107de1b 100644
--- a/src/villas-relay.cpp
+++ b/src/villas-relay.cpp
@@ -513,9 +513,9 @@ const lws_http_mount Relay::mount = {
 	.basic_auth_login_file = nullptr,
 };
 
-} /* namespace tools */
-} /* namespace node */
-} /* namespace villas */
+} // namespace tools
+} // namespace node
+} // namespace villas
 
 int main(int argc, char *argv[])
 {
diff --git a/src/villas-relay.hpp b/src/villas-relay.hpp
index ad3037384..3b8fd6000 100644
--- a/src/villas-relay.hpp
+++ b/src/villas-relay.hpp
@@ -155,6 +155,6 @@ protected:
 	}
 };
 
-} /* namespace tools */
-} /* namespace node */
-} /* namespace villas */
+} // namespace tools
+} // namespace node
+} // namespace villas
diff --git a/src/villas-signal.cpp b/src/villas-signal.cpp
index ef0baaa21..2b8b24708 100644
--- a/src/villas-signal.cpp
+++ b/src/villas-signal.cpp
@@ -314,9 +314,9 @@ out:			sample_decref(t);
 	}
 };
 
-} /* namespace tools */
-} /* namespace node */
-} /* namespace villas */
+} // namespace tools
+} // namespace node
+} // namespace villas
 
 int main(int argc, char *argv[])
 {
diff --git a/src/villas-test-config.cpp b/src/villas-test-config.cpp
index 4d82c2b6f..538a5688a 100644
--- a/src/villas-test-config.cpp
+++ b/src/villas-test-config.cpp
@@ -106,9 +106,9 @@ protected:
 	}
 };
 
-} /* namespace tools */
-} /* namespace node */
-} /* namespace villas */
+} // namespace tools
+} // namespace node
+} // namespace villas
 
 int main(int argc, char *argv[])
 {
diff --git a/src/villas-test-rtt.cpp b/src/villas-test-rtt.cpp
index 3b84c718e..da66d6bb2 100644
--- a/src/villas-test-rtt.cpp
+++ b/src/villas-test-rtt.cpp
@@ -238,9 +238,9 @@ check:			if (optarg == endptr)
 	}
 };
 
-} /* namespace tools */
-} /* namespace node */
-} /* namespace villas */
+} // namespace tools
+} // namespace node
+} // namespace villas
 
 int main(int argc, char *argv[])
 {
diff --git a/src/villas-zmq-keygen.cpp b/src/villas-zmq-keygen.cpp
index 262f6b391..7f7cda8a1 100644
--- a/src/villas-zmq-keygen.cpp
+++ b/src/villas-zmq-keygen.cpp
@@ -73,9 +73,9 @@ protected:
 	}
 };
 
-} /* namespace tools */
-} /* namespace node */
-} /* namespace villas */
+} // namespace tools
+} // namespace node
+} // namespace villas
 
 int main(int argc, char *argv[])
 {