diff --git a/fpga/src/README.pcimem.md b/fpga/src/README.pcimem.md
index 7352b0341..17cb89f1e 100644
--- a/fpga/src/README.pcimem.md
+++ b/fpga/src/README.pcimem.md
@@ -13,10 +13,10 @@ The pcimem application provides a simple method of reading and writing
 to memory registers on a PCI card.
 
 Usage:	./pcimem { sys file } { offset } [ type [ data ] ]
-	sys file: sysfs file for the pci resource to act on
-	offset  : offset into pci memory region to act upon
-	type    : access operation type : [b]yte, [h]alfword, [w]ord
-	data    : data to be written
+  sys file: sysfs file for the pci resource to act on
+  offset  : offset into pci memory region to act upon
+  type    : access operation type : [b]yte, [h]alfword, [w]ord
+  data    : data to be written
 
 ## Platform Support
 
diff --git a/include/villas/log_opal_sink.hpp b/include/villas/log_opal_sink.hpp
index 76520091e..55c904c07 100644
--- a/include/villas/log_opal_sink.hpp
+++ b/include/villas/log_opal_sink.hpp
@@ -17,7 +17,7 @@
 
 extern "C" {
 /* Define RTLAB before including OpalPrint.h for messages to be sent
-	* to the OpalDisplay. Otherwise stdout will be used. */
+ * to the OpalDisplay. Otherwise stdout will be used. */
 #define RTLAB
 #include <OpalPrint.h>
 }
diff --git a/include/villas/path.hpp b/include/villas/path.hpp
index d58b9a8da..fb01de9e3 100644
--- a/include/villas/path.hpp
+++ b/include/villas/path.hpp
@@ -140,9 +140,9 @@ public:
   void checkPrepared();
 
   /* Start a path.
-	*
-	* Start a new pthread for receiving/sending messages over this path.
-	*/
+   *
+   * Start a new pthread for receiving/sending messages over this path.
+   */
   void start();
 
   // Stop a path.
@@ -154,13 +154,13 @@ public:
   unsigned getOutputSignalsMaxCount();
 
   /* Parse a single path and add it to the global configuration.
-	*
-	* @param json A JSON object containing the configuration of the path.
-	* @param p Pointer to the allocated memory for this path
-	* @param nodes A linked list of all existing nodes
-	* @retval 0 Success. Everything went well.
-	* @retval <0 Error. Something went wrong.
-	*/
+   *
+   * @param json A JSON object containing the configuration of the path.
+   * @param p Pointer to the allocated memory for this path
+   * @param nodes A linked list of all existing nodes
+   * @retval 0 Success. Everything went well.
+   * @retval <0 Error. Something went wrong.
+   */
   void parse(json_t *json, NodeList &nodes, const uuid_t sn_uuid);
 
   void parseMask(json_t *json_mask, NodeList &nodes);
diff --git a/src/villas-relay.cpp b/src/villas-relay.cpp
index f58f89c28..8d2a71f14 100644
--- a/src/villas-relay.cpp
+++ b/src/villas-relay.cpp
@@ -165,7 +165,7 @@ void RelayConnection::read(void *in, size_t len) {
       auto c = p.second;
 
       /* We skip the current connection in order
-				* to avoid receiving our own data */
+       * to avoid receiving our own data */
       if (loopback == false && c == this)
         continue;
 
diff --git a/tests/unit/format.cpp b/tests/unit/format.cpp
index c97120e4e..c05590ccf 100644
--- a/tests/unit/format.cpp
+++ b/tests/unit/format.cpp
@@ -382,12 +382,12 @@ ParameterizedTest(Param *p, format, highlevel, .init = init_memory) {
   cr_assert_eq(ret, 0);
 
 #if 0 // Show the file contents
-	char cmd[128];
-	if (p->fmt == "csv" || p->fmt == "json" || p->fmt == "villas.human")
-		snprintf(cmd, sizeof(cmd), "cat %s", fn);
-	else
-		snprintf(cmd, sizeof(cmd), "hexdump -C %s", fn);
-	system(cmd);
+  char cmd[128];
+  if (p->fmt == "csv" || p->fmt == "json" || p->fmt == "villas.human")
+    snprintf(cmd, sizeof(cmd), "cat %s", fn);
+  else
+    snprintf(cmd, sizeof(cmd), "hexdump -C %s", fn);
+  system(cmd);
 #endif
 
   rewind(stream);
diff --git a/tools/villas b/tools/villas
index 95f0cc1aa..c5f5a90b0 100755
--- a/tools/villas
+++ b/tools/villas
@@ -22,17 +22,17 @@ ARGS=${@:2}
 
 # Check if tool is available
 if ! echo ${SUBTOOLS} | grep -wqFe "${SUBTOOL}"; then
-	echo "Usage: villas [-h | --help | TOOL]"
-	echo "  TOOL     is one of ${SUBTOOLS}"
-	echo
-	echo "For detailed documentation, please see: 'villas node'"
-	echo "  http://villas.fein-aachen.org/doc/"
-	echo
+    echo "Usage: villas [-h | --help | TOOL]"
+    echo "  TOOL     is one of ${SUBTOOLS}"
+    echo
+    echo "For detailed documentation, please see: 'villas node'"
+    echo "  http://villas.fein-aachen.org/doc/"
+    echo
 
-	# Show VILLASnode copyright and contact info
-	villas-node -h | tail -n3
-	echo "-h" "--help" | grep -wqFe "${SUBTOOL}"
-	exit $?
+    # Show VILLASnode copyright and contact info
+    villas-node -h | tail -n3
+    echo "-h" "--help" | grep -wqFe "${SUBTOOL}"
+    exit $?
 fi
 
 exec villas-${SUBTOOL} ${ARGS}