diff --git a/src/spicelib/devices/bsim3/b3mdel.c b/src/spicelib/devices/bsim3/b3mdel.c
index 917522f38..b3c58aff2 100644
--- a/src/spicelib/devices/bsim3/b3mdel.c
+++ b/src/spicelib/devices/bsim3/b3mdel.c
@@ -26,8 +26,8 @@ BSIM3instance *prev = NULL;
 BSIM3model **oldmod;
 
     oldmod = model;
-    for (; *model ; model = &((*model)->BSIM3nextModel)) 
-    {    if ((*model)->BSIM3modName == modname || 
+    for (; *model ; model = &((*model)->BSIM3nextModel)) {
+         if ((*model)->BSIM3modName == modname || 
              (modfast && *model == modfast))
 	     goto delgot;
          oldmod = model;
@@ -36,8 +36,8 @@ BSIM3model **oldmod;
 
 delgot:
     *oldmod = (*model)->BSIM3nextModel; /* cut deleted device out of list */
-    for (here = (*model)->BSIM3instances; here; here = here->BSIM3nextInstance)
-    {    if(prev) FREE(prev);
+    for (here = (*model)->BSIM3instances; here; here = here->BSIM3nextInstance) {
+         if(prev) FREE(prev);
          prev = here;
     }
     if(prev) FREE(prev);
diff --git a/src/spicelib/devices/bsim3soi_dd/b3soiddmdel.c b/src/spicelib/devices/bsim3soi_dd/b3soiddmdel.c
index f895c62f5..f94dc1932 100644
--- a/src/spicelib/devices/bsim3soi_dd/b3soiddmdel.c
+++ b/src/spicelib/devices/bsim3soi_dd/b3soiddmdel.c
@@ -26,8 +26,8 @@ B3SOIDDinstance *prev = NULL;
 B3SOIDDmodel **oldmod;
 
     oldmod = model;
-    for (; *model ; model = &((*model)->B3SOIDDnextModel)) 
-    {    if ((*model)->B3SOIDDmodName == modname || 
+    for (; *model ; model = &((*model)->B3SOIDDnextModel)) {
+         if ((*model)->B3SOIDDmodName == modname || 
              (modfast && *model == modfast))
 	     goto delgot;
          oldmod = model;
@@ -36,8 +36,8 @@ B3SOIDDmodel **oldmod;
 
 delgot:
     *oldmod = (*model)->B3SOIDDnextModel; /* cut deleted device out of list */
-    for (here = (*model)->B3SOIDDinstances; here; here = here->B3SOIDDnextInstance)
-    {    if(prev) FREE(prev);
+    for (here = (*model)->B3SOIDDinstances; here; here = here->B3SOIDDnextInstance) {
+         if(prev) FREE(prev);
          prev = here;
     }
     if(prev) FREE(prev);
diff --git a/src/spicelib/devices/bsim3soi_fd/b3soifdmdel.c b/src/spicelib/devices/bsim3soi_fd/b3soifdmdel.c
index 072019223..65d34aea5 100644
--- a/src/spicelib/devices/bsim3soi_fd/b3soifdmdel.c
+++ b/src/spicelib/devices/bsim3soi_fd/b3soifdmdel.c
@@ -25,8 +25,8 @@ B3SOIFDinstance *prev = NULL;
 B3SOIFDmodel **oldmod;
 
     oldmod = model;
-    for (; *model ; model = &((*model)->B3SOIFDnextModel)) 
-    {    if ((*model)->B3SOIFDmodName == modname || 
+    for (; *model ; model = &((*model)->B3SOIFDnextModel)) {
+         if ((*model)->B3SOIFDmodName == modname || 
              (modfast && *model == modfast))
 	     goto delgot;
          oldmod = model;
@@ -35,8 +35,8 @@ B3SOIFDmodel **oldmod;
 
 delgot:
     *oldmod = (*model)->B3SOIFDnextModel; /* cut deleted device out of list */
-    for (here = (*model)->B3SOIFDinstances; here; here = here->B3SOIFDnextInstance)
-    {    if(prev) FREE(prev);
+    for (here = (*model)->B3SOIFDinstances; here; here = here->B3SOIFDnextInstance) {
+         if(prev) FREE(prev);
          prev = here;
     }
     if(prev) FREE(prev);
diff --git a/src/spicelib/devices/bsim3soi_pd/b3soipdmdel.c b/src/spicelib/devices/bsim3soi_pd/b3soipdmdel.c
index a946c018d..4d24f792f 100644
--- a/src/spicelib/devices/bsim3soi_pd/b3soipdmdel.c
+++ b/src/spicelib/devices/bsim3soi_pd/b3soipdmdel.c
@@ -25,8 +25,8 @@ B3SOIPDinstance *prev = NULL;
 B3SOIPDmodel **oldmod;
 
     oldmod = model;
-    for (; *model ; model = &((*model)->B3SOIPDnextModel)) 
-    {    if ((*model)->B3SOIPDmodName == modname || 
+    for (; *model ; model = &((*model)->B3SOIPDnextModel)) {
+         if ((*model)->B3SOIPDmodName == modname || 
              (modfast && *model == modfast))
 	     goto delgot;
          oldmod = model;
@@ -35,8 +35,8 @@ B3SOIPDmodel **oldmod;
 
 delgot:
     *oldmod = (*model)->B3SOIPDnextModel; /* cut deleted device out of list */
-    for (here = (*model)->B3SOIPDinstances; here; here = here->B3SOIPDnextInstance)
-    {    if(prev) FREE(prev);
+    for (here = (*model)->B3SOIPDinstances; here; here = here->B3SOIPDnextInstance) {
+         if(prev) FREE(prev);
          prev = here;
     }
     if(prev) FREE(prev);
diff --git a/src/spicelib/devices/bsim3v0/b3v0mdel.c b/src/spicelib/devices/bsim3v0/b3v0mdel.c
index 2f6033cb2..d4c5603d2 100644
--- a/src/spicelib/devices/bsim3v0/b3v0mdel.c
+++ b/src/spicelib/devices/bsim3v0/b3v0mdel.c
@@ -19,8 +19,8 @@ BSIM3v0instance *prev = NULL;
 BSIM3v0model **oldmod;
 
     oldmod = model;
-    for (; *model ; model = &((*model)->BSIM3v0nextModel)) 
-    {    if ((*model)->BSIM3v0modName == modname || 
+    for (; *model ; model = &((*model)->BSIM3v0nextModel)) {
+         if ((*model)->BSIM3v0modName == modname || 
              (modfast && *model == modfast))
 	     goto delgot;
          oldmod = model;
@@ -29,8 +29,8 @@ BSIM3v0model **oldmod;
 
 delgot:
     *oldmod = (*model)->BSIM3v0nextModel; /* cut deleted device out of list */
-    for (here = (*model)->BSIM3v0instances; here; here = here->BSIM3v0nextInstance)
-    {    if(prev) FREE(prev);
+    for (here = (*model)->BSIM3v0instances; here; here = here->BSIM3v0nextInstance) {
+         if(prev) FREE(prev);
          prev = here;
     }
     if(prev) FREE(prev);
diff --git a/src/spicelib/devices/bsim3v1/b3v1mdel.c b/src/spicelib/devices/bsim3v1/b3v1mdel.c
index d27313952..1eb7b9d5a 100644
--- a/src/spicelib/devices/bsim3v1/b3v1mdel.c
+++ b/src/spicelib/devices/bsim3v1/b3v1mdel.c
@@ -25,8 +25,8 @@ BSIM3v1instance *prev = NULL;
 BSIM3v1model **oldmod;
 
     oldmod = model;
-    for (; *model ; model = &((*model)->BSIM3v1nextModel)) 
-    {    if ((*model)->BSIM3v1modName == modname || 
+    for (; *model ; model = &((*model)->BSIM3v1nextModel)) {
+         if ((*model)->BSIM3v1modName == modname || 
              (modfast && *model == modfast))
 	     goto delgot;
          oldmod = model;
@@ -35,8 +35,8 @@ BSIM3v1model **oldmod;
 
 delgot:
     *oldmod = (*model)->BSIM3v1nextModel; /* cut deleted device out of list */
-    for (here = (*model)->BSIM3v1instances; here; here = here->BSIM3v1nextInstance)
-    {    if(prev) FREE(prev);
+    for (here = (*model)->BSIM3v1instances; here; here = here->BSIM3v1nextInstance) {
+         if(prev) FREE(prev);
          prev = here;
     }
     if(prev) FREE(prev);
diff --git a/src/spicelib/devices/bsim3v32/b3v32mdel.c b/src/spicelib/devices/bsim3v32/b3v32mdel.c
index 2558d7bfe..d6f998aae 100644
--- a/src/spicelib/devices/bsim3v32/b3v32mdel.c
+++ b/src/spicelib/devices/bsim3v32/b3v32mdel.c
@@ -24,8 +24,8 @@ BSIM3v32instance *prev = NULL;
 BSIM3v32model **oldmod;
 
     oldmod = model;
-    for (; *model ; model = &((*model)->BSIM3v32nextModel))
-    {    if ((*model)->BSIM3v32modName == modname ||
+    for (; *model ; model = &((*model)->BSIM3v32nextModel)) {
+         if ((*model)->BSIM3v32modName == modname ||
              (modfast && *model == modfast))
              goto delgot;
          oldmod = model;
@@ -34,8 +34,8 @@ BSIM3v32model **oldmod;
 
 delgot:
     *oldmod = (*model)->BSIM3v32nextModel; /* cut deleted device out of list */
-    for (here = (*model)->BSIM3v32instances; here; here = here->BSIM3v32nextInstance)
-    {    if(prev) FREE(prev);
+    for (here = (*model)->BSIM3v32instances; here; here = here->BSIM3v32nextInstance) {
+         if(prev) FREE(prev);
          prev = here;
     }
     if(prev) FREE(prev);
diff --git a/src/spicelib/devices/bsim4/b4mdel.c b/src/spicelib/devices/bsim4/b4mdel.c
index 7dde80458..a150beb93 100644
--- a/src/spicelib/devices/bsim4/b4mdel.c
+++ b/src/spicelib/devices/bsim4/b4mdel.c
@@ -76,8 +76,8 @@ BSIM4instance *prev = NULL;
 BSIM4model **oldmod;
 
     oldmod = model;
-    for (; *model ; model = &((*model)->BSIM4nextModel)) 
-    {    if ((*model)->BSIM4modName == modname || 
+    for (; *model ; model = &((*model)->BSIM4nextModel)) {
+         if ((*model)->BSIM4modName == modname || 
              (modfast && *model == modfast))
 	     goto delgot;
          oldmod = model;
@@ -86,8 +86,8 @@ BSIM4model **oldmod;
 
 delgot:
     *oldmod = (*model)->BSIM4nextModel; /* cut deleted device out of list */
-    for (here = (*model)->BSIM4instances; here; here = here->BSIM4nextInstance)
-    {    if(prev) FREE(prev);
+    for (here = (*model)->BSIM4instances; here; here = here->BSIM4nextInstance) {
+         if(prev) FREE(prev);
          prev = here;
     }
     if(prev) FREE(prev);
diff --git a/src/spicelib/devices/bsim4v5/b4v5mdel.c b/src/spicelib/devices/bsim4v5/b4v5mdel.c
index 9c6deadbd..de2ce9896 100644
--- a/src/spicelib/devices/bsim4v5/b4v5mdel.c
+++ b/src/spicelib/devices/bsim4v5/b4v5mdel.c
@@ -26,8 +26,8 @@ BSIM4v5instance *prev = NULL;
 BSIM4v5model **oldmod;
 
     oldmod = model;
-    for (; *model ; model = &((*model)->BSIM4v5nextModel)) 
-    {    if ((*model)->BSIM4v5modName == modname || 
+    for (; *model ; model = &((*model)->BSIM4v5nextModel)) {
+         if ((*model)->BSIM4v5modName == modname || 
              (modfast && *model == modfast))
 	     goto delgot;
          oldmod = model;
@@ -36,8 +36,8 @@ BSIM4v5model **oldmod;
 
 delgot:
     *oldmod = (*model)->BSIM4v5nextModel; /* cut deleted device out of list */
-    for (here = (*model)->BSIM4v5instances; here; here = here->BSIM4v5nextInstance)
-    {    if(prev) FREE(prev);
+    for (here = (*model)->BSIM4v5instances; here; here = here->BSIM4v5nextInstance) {
+         if(prev) FREE(prev);
          prev = here;
     }
     if(prev) FREE(prev);
diff --git a/src/spicelib/devices/bsim4v6/b4v6mdel.c b/src/spicelib/devices/bsim4v6/b4v6mdel.c
index 899477748..b34f9f563 100644
--- a/src/spicelib/devices/bsim4v6/b4v6mdel.c
+++ b/src/spicelib/devices/bsim4v6/b4v6mdel.c
@@ -28,8 +28,8 @@ BSIM4v6instance *prev = NULL;
 BSIM4v6model **oldmod;
 
     oldmod = model;
-    for (; *model ; model = &((*model)->BSIM4v6nextModel)) 
-    {    if ((*model)->BSIM4v6modName == modname || 
+    for (; *model ; model = &((*model)->BSIM4v6nextModel)) {
+         if ((*model)->BSIM4v6modName == modname || 
              (modfast && *model == modfast))
 	     goto delgot;
          oldmod = model;
@@ -38,8 +38,8 @@ BSIM4v6model **oldmod;
 
 delgot:
     *oldmod = (*model)->BSIM4v6nextModel; /* cut deleted device out of list */
-    for (here = (*model)->BSIM4v6instances; here; here = here->BSIM4v6nextInstance)
-    {    if(prev) FREE(prev);
+    for (here = (*model)->BSIM4v6instances; here; here = here->BSIM4v6nextInstance) {
+         if(prev) FREE(prev);
          prev = here;
     }
     if(prev) FREE(prev);
diff --git a/src/spicelib/devices/bsim4v7/b4v7mdel.c b/src/spicelib/devices/bsim4v7/b4v7mdel.c
index 1ed1e50b0..3fe33d81e 100644
--- a/src/spicelib/devices/bsim4v7/b4v7mdel.c
+++ b/src/spicelib/devices/bsim4v7/b4v7mdel.c
@@ -28,8 +28,8 @@ BSIM4v7instance *prev = NULL;
 BSIM4v7model **oldmod;
 
     oldmod = model;
-    for (; *model ; model = &((*model)->BSIM4v7nextModel)) 
-    {    if ((*model)->BSIM4v7modName == modname || 
+    for (; *model ; model = &((*model)->BSIM4v7nextModel)) {
+         if ((*model)->BSIM4v7modName == modname || 
              (modfast && *model == modfast))
 	     goto delgot;
          oldmod = model;
@@ -38,8 +38,8 @@ BSIM4v7model **oldmod;
 
 delgot:
     *oldmod = (*model)->BSIM4v7nextModel; /* cut deleted device out of list */
-    for (here = (*model)->BSIM4v7instances; here; here = here->BSIM4v7nextInstance)
-    {    if(prev) FREE(prev);
+    for (here = (*model)->BSIM4v7instances; here; here = here->BSIM4v7nextInstance) {
+         if(prev) FREE(prev);
          prev = here;
     }
     if(prev) FREE(prev);
diff --git a/src/spicelib/devices/bsimsoi/b4soimdel.c b/src/spicelib/devices/bsimsoi/b4soimdel.c
index bb78be090..72ab35a94 100644
--- a/src/spicelib/devices/bsimsoi/b4soimdel.c
+++ b/src/spicelib/devices/bsimsoi/b4soimdel.c
@@ -33,8 +33,8 @@ B4SOIinstance *prev = NULL;
 B4SOImodel **oldmod;
 
     oldmod = model;
-    for (; *model ; model = &((*model)->B4SOInextModel)) 
-    {    if ((*model)->B4SOImodName == modname || 
+    for (; *model ; model = &((*model)->B4SOInextModel)) {
+         if ((*model)->B4SOImodName == modname || 
              (modfast && *model == modfast))
              goto delgot;
          oldmod = model;
@@ -43,8 +43,8 @@ B4SOImodel **oldmod;
 
 delgot:
     *oldmod = (*model)->B4SOInextModel; /* cut deleted device out of list */
-    for (here = (*model)->B4SOIinstances; here; here = here->B4SOInextInstance)
-    {
+    for (here = (*model)->B4SOIinstances; here; here = here->B4SOInextInstance) {
+     
          if(prev) FREE(prev);
          prev = here;
     }