diff --git a/src/cost.c b/src/cost.c
index 8cfc2d5..27e3da6 100644
--- a/src/cost.c
+++ b/src/cost.c
@@ -12,7 +12,8 @@
 // Private methods
 //************************************************************************
 
-int selfInitiator(const System sys, const int run)
+int
+selfInitiator (const System sys, const int run)
 {
   int self_initiator;
 
@@ -47,7 +48,8 @@ int selfInitiator(const System sys, const int run)
 }
 
 //! Count the number of any self-initiators
-int selfInitiators(const System sys)
+int
+selfInitiators (const System sys)
 {
   int count;
   int run;
@@ -77,14 +79,15 @@ int selfInitiators(const System sys)
  *
  * A lower value (closer to 0) is a more feasible attack.
  */
-int attackCost(const System sys)
+int
+attackCost (const System sys)
 {
   int cost;
 
   cost = 0;
 
-  cost += get_semitrace_length();
-  cost += 5 * selfInitiators(sys);
+  cost += get_semitrace_length ();
+  cost += 5 * selfInitiators (sys);
 
   return cost;
 }
diff --git a/src/cost.h b/src/cost.h
index f660e44..75a09ae 100644
--- a/src/cost.h
+++ b/src/cost.h
@@ -1,6 +1,6 @@
 #ifndef COST
 #define COST
 
-int attackCost(const System sys);
+int attackCost (const System sys);
 
 #endif
diff --git a/src/dotout.c b/src/dotout.c
index 7cc78d8..ce9b404 100644
--- a/src/dotout.c
+++ b/src/dotout.c
@@ -7,8 +7,8 @@ extern int *graph;
 extern int nodes;
 extern int graph_uordblks;
 
-extern Protocol INTRUDER;		// Pointers, to be set by the Init of arachne.c
-extern Role I_M;			// Same here.
+extern Protocol INTRUDER;	// Pointers, to be set by the Init of arachne.c
+extern Role I_M;		// Same here.
 extern Role I_RRS;
 extern Role I_RRSD;
 
@@ -63,7 +63,7 @@ dotSemiState (const System sys)
   termPrint (sys->current_claim->type);
   eprintf ("\";\n");
 
-  from_intruder_count = 0;		// number of terms that can come from the initial knowledge
+  from_intruder_count = 0;	// number of terms that can come from the initial knowledge
 
   // Needed for the bindings later on: create graph
   goal_graph_create ();		// create graph
@@ -333,7 +333,7 @@ dotSemiState (const System sys)
 	      if (false && incoming_arrow_count == 0)
 		{
 		  // No incoming arrows: can be generated from initial intruder knowledge
-		  
+
 		  from_intruder_count++;
 		  eprintf ("\tintruder -> ");
 		  node (run, ev);
@@ -349,7 +349,8 @@ dotSemiState (const System sys)
   // Third, the intruder node (if needed)
   if (from_intruder_count > 0)
     {
-      eprintf ("\tintruder [label=\"Initial intruder knowledge\", color=red];\n");
+      eprintf
+	("\tintruder [label=\"Initial intruder knowledge\", color=red];\n");
     }
 
   // Fourth, all ranking info
@@ -413,4 +414,3 @@ dotSemiState (const System sys)
   // close graph
   eprintf ("};\n\n");
 }
-
diff --git a/src/output.c b/src/output.c
index df41006..470d7b9 100644
--- a/src/output.c
+++ b/src/output.c
@@ -609,7 +609,7 @@ graphNode (const System sys)
   // Print step 
   printf ("%i:", sys->runs[run].step - 1);
 
-  if (rd->type == CLAIM && (!isRunTrusted(sys,run)))
+  if (rd->type == CLAIM && (!isRunTrusted (sys, run)))
     {
       printf ("Skip claim in #%i\"", run);
     }
diff --git a/src/termlist.c b/src/termlist.c
index 110ba78..ee1279e 100644
--- a/src/termlist.c
+++ b/src/termlist.c
@@ -938,7 +938,7 @@ termlistMinusTermlist (const Termlist tlbig, const Termlist tlsmall)
       else
 	{
 	  // This item will remain in the list.
-          tl = tl->next;
+	  tl = tl->next;
 	}
     }
   return tlnewstart;