diff --git a/src/ngnutmeg.c b/src/ngnutmeg.c
index c21a372ba..a788b7ce4 100644
--- a/src/ngnutmeg.c
+++ b/src/ngnutmeg.c
@@ -7,16 +7,19 @@ Copyright 1990 Regents of the University of California.  All rights reserved.
 #include "ngspice/ngspice.h"
 
 #define CONFIG
+
 #include <stdio.h>
 #include "ngspice/ifsim.h"
 #include "ngspice/suffix.h"
 
+
 IFsimulator SIMinfo = {
-    "ngnutmeg",       /* my name */
+    "ngnutmeg",                                /* my name */
     "data analysis and manipulation program",  /* more about me */
-    Spice_Version,         /* my version */
-    NULL,       /* newCircuit function */
-    NULL,       /* deleteCircuit function */
+    Spice_Version,                             /* my version */
+
+    NULL,           /* newCircuit function */
+    NULL,           /* deleteCircuit function */
     NULL,           /* newNode function */ /* NEEDED */
     NULL,           /* groundNode function */
     NULL,           /* bindNode function */
@@ -43,7 +46,7 @@ IFsimulator SIMinfo = {
     NULL,           /* findTask function */
     NULL,           /* deleteTask function */
     NULL,           /* doAnalyses function */
-    NULL,	    /* non-convergence message function */
+    NULL,           /* non-convergence message function */
     0,
     NULL,
     0,
@@ -51,16 +54,21 @@ IFsimulator SIMinfo = {
     0,
     NULL,
     0,
-    NULL,	
+    NULL,
 };
 
-#ifdef CIDER
+
 /* An ugly hack */
+
+#ifdef CIDER
+
 #include "ngspice/cktdefs.h"
+
 void
 NDEVacct(CKTcircuit *ckt, FILE *file)
 {
-NG_IGNORE(ckt);
-fprintf(file, "Ouch, you have called NDEV from ngnutmeg\n");
+    NG_IGNORE(ckt);
+    fprintf(file, "Ouch, you have called NDEV from ngnutmeg\n");
 }
+
 #endif
diff --git a/src/ngspice.c b/src/ngspice.c
index 18be1fa16..f4ae3445f 100644
--- a/src/ngspice.c
+++ b/src/ngspice.c
@@ -1,4 +1,4 @@
-/* Configuration file for ng-spice */
+/* Configuration file for ngspice */
 
 /**********
 Copyright 1990 Regents of the University of California.  All rights reserved.
@@ -6,71 +6,71 @@ Copyright 1990 Regents of the University of California.  All rights reserved.
 
 #include "ngspice/ngspice.h"
 
-
 #define CONFIG
 
-
 #include "ngspice/devdefs.h"
 #include "ngspice/noisedef.h"
 #include "ngspice/suffix.h"
 
 
 /* XXX Should be -1 ? There is always an extra null element at the end ? */
-static char * specSigList[] = {
+static char *specSigList[] = {
     "time"
 };
 
+
 static IFparm nodeParms[] = {
-    IP( "nodeset",PARM_NS ,IF_REAL,"suggested initial voltage"),
-    IP( "ic",PARM_IC ,IF_REAL,"initial voltage"),
-    IP( "type",PARM_NODETYPE ,IF_INTEGER,"output type of equation")
+    IP("nodeset", PARM_NS ,       IF_REAL,    "suggested initial voltage"),
+    IP("ic",      PARM_IC ,       IF_REAL,    "initial voltage"),
+    IP("type",    PARM_NODETYPE , IF_INTEGER, "output type of equation")
 };
 
+
 IFsimulator SIMinfo = {
-    "ngspice",			/* name */
-    "Circuit level simulation program",	/* more about me */
-    Spice_Version,		/* version */
+    "ngspice",                           /* my name */
+    "Circuit level simulation program",  /* more about me */
+    Spice_Version,                       /* my version */
 
-    CKTinit,			/* newCircuit function */
-    CKTdestroy,			/* deleteCircuit function */
+    CKTinit,                    /* newCircuit function */
+    CKTdestroy,                 /* deleteCircuit function */
 
-    CKTnewNode,			/* newNode function */
-    CKTground,			/* groundNode function */
-    CKTbindNode,		/* bindNode function */
-    CKTfndNode,			/* findNode function */
-    (int(*)(CKTcircuit *,void *,int,void **,IFuid *)) /* va, type cast for CKTinst2Node */      
-    CKTinst2Node,		/* instToNode function */
-    CKTsetNodPm,		/* setNodeParm function */
-    CKTaskNodQst,		/* askNodeQuest function */
-    CKTdltNod,			/* deleteNode function */
+    CKTnewNode,                 /* newNode function */
+    CKTground,                  /* groundNode function */
+    CKTbindNode,                /* bindNode function */
+    CKTfndNode,                 /* findNode function */
+    (int(*)(CKTcircuit *,void *,int,void **,IFuid *)) /* va, type cast for CKTinst2Node */
+    CKTinst2Node,               /* instToNode function */
+    CKTsetNodPm,                /* setNodeParm function */
+    CKTaskNodQst,               /* askNodeQuest function */
+    CKTdltNod,                  /* deleteNode function */
 
-    CKTcrtElt,			/* newInstance function */
-    CKTparam,			/* setInstanceParm function */
-    CKTask,			/* askInstanceQuest function */
-    CKTfndDev,			/* findInstance funciton */
-    CKTdltInst,			/* deleteInstance function */
+    CKTcrtElt,                  /* newInstance function */
+    CKTparam,                   /* setInstanceParm function */
+    CKTask,                     /* askInstanceQuest function */
+    CKTfndDev,                  /* findInstance funciton */
+    CKTdltInst,                 /* deleteInstance function */
 
-    CKTmodCrt,			/* newModel function */
-    CKTmodParam,		/* setModelParm function */
-    CKTmodAsk,			/* askModelQuest function */
-    CKTfndMod,			/* findModel function */
-    CKTdltMod,			/* deleteModel function */
+    CKTmodCrt,                  /* newModel function */
+    CKTmodParam,                /* setModelParm function */
+    CKTmodAsk,                  /* askModelQuest function */
+    CKTfndMod,                  /* findModel function */
+    CKTdltMod,                  /* deleteModel function */
 
-    CKTnewTask,			/* newTask function */
-    CKTnewAnal,			/* newAnalysis function */
-    CKTsetAnalPm,		/* setAnalysisParm function */
-    CKTaskAnalQ,		/* askAnalysisQuest function */
-    CKTfndAnal,			/* findAnalysis function */
-    CKTfndTask,			/* findTask function */
-    CKTdelTask,			/* deleteTask function */
+    CKTnewTask,                 /* newTask function */
+    CKTnewAnal,                 /* newAnalysis function */
+    CKTsetAnalPm,               /* setAnalysisParm function */
+    CKTaskAnalQ,                /* askAnalysisQuest function */
+    CKTfndAnal,                 /* findAnalysis function */
+    CKTfndTask,                 /* findTask function */
+    CKTdelTask,                 /* deleteTask function */
 
-    CKTdoJob,			/* doAnalyses function */
-    CKTtrouble,			/* non-convergence message function */
+    CKTdoJob,                   /* doAnalyses function */
+    CKTtrouble,                 /* non-convergence message function */
 
-    0,				/* Initialized in SIMinit() */
-    NULL,			/* Initialized in SIMinit() */
-    0,				/* Initialized in SIMinit() */
-    NULL,			/* Initialized in SIMinit() */
+    0,                          /* Initialized in SIMinit() */
+    NULL,                       /* Initialized in SIMinit() */
+    0,                          /* Initialized in SIMinit() */
+    NULL,                       /* Initialized in SIMinit() */
 
     NUMELEMS(nodeParms),
     nodeParms,