diff --git a/src/dbtools/dbLoadTemplate.h b/src/dbtools/dbLoadTemplate.h
index a341b8098..29f7a0b52 100644
--- a/src/dbtools/dbLoadTemplate.h
+++ b/src/dbtools/dbLoadTemplate.h
@@ -3,8 +3,7 @@
 *     National Laboratory.
 * Copyright (c) 2002 The Regents of the University of California, as
 *     Operator of Los Alamos National Laboratory.
-* EPICS BASE Versions 3.13.7
-* and higher are distributed subject to a Software License Agreement found
+* EPICS BASE is distributed subject to a Software License Agreement found
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
 /* dbLoadTemplate.h */
diff --git a/src/dbtools/dbLoadTemplate.y b/src/dbtools/dbLoadTemplate.y
index 0a919dda6..5fb4fbfa7 100644
--- a/src/dbtools/dbLoadTemplate.y
+++ b/src/dbtools/dbLoadTemplate.y
@@ -30,7 +30,7 @@ static int yyerror();
 static char *sub_collect = NULL;
 static char** vars = NULL;
 static char* db_file_name = NULL;
-static int var_count,sub_count;
+static int var_count, sub_count;
 
 %}
 
@@ -45,7 +45,7 @@ static int var_count,sub_count;
 
 %union
 {
-    int	Int;
+    int Int;
     char Char;
     char *Str;
     double Real;
@@ -54,191 +54,192 @@ static int var_count,sub_count;
 %%
 
 template: templs
-	| subst
-	;
+    | subst
+    ;
 
 templs: templs templ
-	| templ
-	;
+    | templ
+    ;
 
 templ: templ_head O_BRACE subst C_BRACE
-	| templ_head
-	{
-		if(db_file_name)
-			dbLoadRecords(db_file_name,NULL);
-		else
-			fprintf(stderr,"Error: no db file name given\n");
-	}
-	;
+    | templ_head
+    {
+        if (db_file_name)
+            dbLoadRecords(db_file_name, NULL);
+        else
+            fprintf(stderr, "Error: no db file name given\n");
+    }
+    ;
 
 templ_head: DBFILE WORD
-	{
-		var_count=0;
-		if(db_file_name) dbmfFree(db_file_name);
-		db_file_name = dbmfMalloc(strlen($2)+1);
-		strcpy(db_file_name,$2);
-		dbmfFree($2);
-	}
-	| DBFILE QUOTE
-	{
-		var_count=0;
-		if(db_file_name) dbmfFree(db_file_name);
-		db_file_name = dbmfMalloc(strlen($2)+1);
-		strcpy(db_file_name,$2);
-		dbmfFree($2);
-	}
-	;
+    {
+        var_count = 0;
+        if (db_file_name)
+            dbmfFree(db_file_name);
+        db_file_name = dbmfMalloc(strlen($2)+1);
+        strcpy(db_file_name, $2);
+        dbmfFree($2);
+    }
+    | DBFILE QUOTE
+    {
+        var_count = 0;
+        if (db_file_name)
+            dbmfFree(db_file_name);
+        db_file_name = dbmfMalloc(strlen($2)+1);
+        strcpy(db_file_name, $2);
+        dbmfFree($2);
+    }
+    ;
 
 subst: PATTERN pattern subs
-	| PATTERN pattern
-	| var_subs
-	;
+    | PATTERN pattern
+    | var_subs
+    ;
 
 pattern: O_BRACE vars C_BRACE
-	{ 
+    {
 #ifdef ERROR_STUFF
-		int i;
-		for(i=0;i<var_count;i++) fprintf(stderr,"variable=(%s)\n",vars[i]);
-		fprintf(stderr,"var_count=%d\n",var_count);
+        int i;
+        for (i = 0; i < var_count; i++)
+            fprintf(stderr, "variable = (%s)\n", vars[i]);
+        fprintf(stderr, "var_count = %d\n", var_count);
 #endif
-	}
-	;
+    }
+    ;
 
 vars: vars var
-	| vars COMMA var
-	| var
-	;
+    | vars COMMA var
+    | var
+    ;
 
 var: WORD
-	{
-	    vars[var_count] = dbmfMalloc(strlen($1)+1);
-	    strcpy(vars[var_count],$1);
-	    var_count++;
-	    dbmfFree($1);
-	}
-	;
+    {
+        vars[var_count] = dbmfMalloc(strlen($1)+1);
+        strcpy(vars[var_count], $1);
+        var_count++;
+        dbmfFree($1);
+    }
+    ;
 
 subs: subs sub
-	| sub
-	;
+    | sub
+    ;
 
 sub: WORD O_BRACE vals C_BRACE
-	{
-		sub_collect[strlen(sub_collect)-1]='\0';
+    {
+        sub_collect[strlen(sub_collect) - 1] = '\0';
 #ifdef ERROR_STUFF
-		fprintf(stderr,"dbLoadRecords(%s)\n",sub_collect);
+        fprintf(stderr, "dbLoadRecords(%s)\n", sub_collect);
 #endif
-		if(db_file_name)
-			dbLoadRecords(db_file_name,sub_collect);
-		else
-			fprintf(stderr,"Error: no db file name given\n");
-		dbmfFree($1);
-		sub_collect[0]='\0';
-		sub_count=0;
-	}
-	| O_BRACE vals C_BRACE
-	{
-		sub_collect[strlen(sub_collect)-1]='\0';
+        if (db_file_name)
+            dbLoadRecords(db_file_name, sub_collect);
+        else
+            fprintf(stderr, "Error: no db file name given\n");
+        dbmfFree($1);
+        sub_collect[0] = '\0';
+        sub_count = 0;
+    }
+    | O_BRACE vals C_BRACE
+    {
+        sub_collect[strlen(sub_collect) - 1] = '\0';
 #ifdef ERROR_STUFF
-		fprintf(stderr,"dbLoadRecords(%s)\n",sub_collect);
+        fprintf(stderr, "dbLoadRecords(%s)\n", sub_collect);
 #endif
-		if(db_file_name)
-			dbLoadRecords(db_file_name,sub_collect);
-		else
-			fprintf(stderr,"Error: no db file name given\n");
-		sub_collect[0]='\0';
-		sub_count=0;
-	}
-	;
+        if (db_file_name)
+            dbLoadRecords(db_file_name, sub_collect);
+        else
+            fprintf(stderr, "Error: no db file name given\n");
+        sub_collect[0] = '\0';
+        sub_count = 0;
+    }
+    ;
 
 vals: vals val
-	| vals COMMA val
-	| val
-	;
+    | vals COMMA val
+    | val
+    ;
 
 val: QUOTE
-	{
-		if(sub_count<=var_count)
-		{
-			strcat(sub_collect,vars[sub_count]);
-			strcat(sub_collect,"=\"");
-			strcat(sub_collect,$1);
-			strcat(sub_collect,"\",");
-			sub_count++;
-		}
-		dbmfFree($1);
-	}
-	| WORD
-	{
-		if(sub_count<=var_count)
-		{
-			strcat(sub_collect,vars[sub_count]);
-			strcat(sub_collect,"=");
-			strcat(sub_collect,$1);
-			strcat(sub_collect,",");
-			sub_count++;
-		}
-		dbmfFree($1);
-	}
-	;
+    {
+        if (sub_count <= var_count) {
+            strcat(sub_collect, vars[sub_count]);
+            strcat(sub_collect, "=\"");
+            strcat(sub_collect, $1);
+            strcat(sub_collect, "\",");
+            sub_count++;
+        }
+        dbmfFree($1);
+    }
+    | WORD
+    {
+        if (sub_count <= var_count) {
+            strcat(sub_collect, vars[sub_count]);
+            strcat(sub_collect, "=");
+            strcat(sub_collect, $1);
+            strcat(sub_collect, ",");
+            sub_count++;
+        }
+        dbmfFree($1);
+    }
+    ;
 
 var_subs: var_subs var_sub
-	| var_sub
-	;
+    | var_sub
+    ;
 
 var_sub: WORD O_BRACE sub_pats C_BRACE
-	{
-		sub_collect[strlen(sub_collect)-1]='\0';
+    {
+        sub_collect[strlen(sub_collect) - 1] = '\0';
 #ifdef ERROR_STUFF
-		fprintf(stderr,"dbLoadRecords(%s)\n",sub_collect);
+        fprintf(stderr, "dbLoadRecords(%s)\n", sub_collect);
 #endif
-		if(db_file_name)
-			dbLoadRecords(db_file_name,sub_collect);
-		else
-			fprintf(stderr,"Error: no db file name given\n");
-		dbmfFree($1);
-		sub_collect[0]='\0';
-		sub_count=0;
-	}
-	| O_BRACE sub_pats C_BRACE
-	{
-		sub_collect[strlen(sub_collect)-1]='\0';
+        if (db_file_name)
+            dbLoadRecords(db_file_name, sub_collect);
+        else
+            fprintf(stderr, "Error: no db file name given\n");
+        dbmfFree($1);
+        sub_collect[0] = '\0';
+        sub_count = 0;
+    }
+    | O_BRACE sub_pats C_BRACE
+    {
+        sub_collect[strlen(sub_collect) - 1] = '\0';
 #ifdef ERROR_STUFF
-		fprintf(stderr,"dbLoadRecords(%s)\n",sub_collect);
+        fprintf(stderr, "dbLoadRecords(%s)\n", sub_collect);
 #endif
-		if(db_file_name)
-			dbLoadRecords(db_file_name,sub_collect);
-		else
-			fprintf(stderr,"Error: no db file name given\n");
-		sub_collect[0]='\0';
-		sub_count=0;
-	}
-	;
+        if (db_file_name)
+            dbLoadRecords(db_file_name, sub_collect);
+        else
+            fprintf(stderr, "Error: no db file name given\n");
+        sub_collect[0] = '\0';
+        sub_count = 0;
+    }
+    ;
 
 sub_pats: sub_pats sub_pat
-	| sub_pats COMMA sub_pat
-	| sub_pat
-	;
+    | sub_pats COMMA sub_pat
+    | sub_pat
+    ;
 
 sub_pat: WORD EQUALS WORD
-	{
-		strcat(sub_collect,$1);
-		strcat(sub_collect,"=");
-		strcat(sub_collect,$3);
-		strcat(sub_collect,",");
-		dbmfFree($1); dbmfFree($3);
-		sub_count++;
-	}
-	| WORD EQUALS QUOTE
-	{
-		strcat(sub_collect,$1);
-		strcat(sub_collect,"=\"");
-		strcat(sub_collect,$3);
-		strcat(sub_collect,"\",");
-		dbmfFree($1); dbmfFree($3);
-		sub_count++;
-	}
-	;
+    {
+        strcat(sub_collect, $1);
+        strcat(sub_collect, "=");
+        strcat(sub_collect, $3);
+        strcat(sub_collect, ",");
+        dbmfFree($1); dbmfFree($3);
+        sub_count++;
+    }
+    | WORD EQUALS QUOTE
+    {
+        strcat(sub_collect, $1);
+        strcat(sub_collect, "=\"");
+        strcat(sub_collect, $3);
+        strcat(sub_collect, "\",");
+        dbmfFree($1); dbmfFree($3);
+        sub_count++;
+    }
+    ;
 
 %%
  
@@ -247,9 +248,9 @@ sub_pat: WORD EQUALS WORD
 static int yyerror(char* str)
 {
     if (str)
-	fprintf(stderr, "Substitution file error: %s\n", str);
+        fprintf(stderr, "Substitution file error: %s\n", str);
     else
-	fprintf(stderr, "Substitution file error.\n");
+        fprintf(stderr, "Substitution file error.\n");
     fprintf(stderr, "line %d: '%s'\n", line_num, yytext);
     return 0;
 }
@@ -258,58 +259,55 @@ static int is_not_inited = 1;
 
 int epicsShareAPI dbLoadTemplate(char* sub_file)
 {
-	FILE *fp;
-	int ind;
+    FILE *fp;
+    int ind;
 
-	line_num=1;
+    line_num = 1;
 
-	if( !sub_file || !*sub_file)
-	{
-		fprintf(stderr,"must specify variable substitution file\n");
-		return -1;
-	}
+    if (!sub_file || !*sub_file) {
+        fprintf(stderr, "must specify variable substitution file\n");
+        return -1;
+    }
 
-	if( !(fp=fopen(sub_file,"r")) )
-	{
-		fprintf(stderr,"dbLoadTemplate: error opening sub file %s\n",sub_file);
-		return -1;
-	}
+    fp = fopen(sub_file, "r");
+    if (!fp) {
+        fprintf(stderr, "dbLoadTemplate: error opening sub file %s\n", sub_file);
+        return -1;
+    }
 
-	vars = (char**)malloc(VAR_MAX_VARS * sizeof(char*));
-	sub_collect = malloc(VAR_MAX_VAR_STRING);
-	if (!vars || !sub_collect)
-	{
-		free(vars);
-		free(sub_collect);
-		fclose(fp);
-		fprintf(stderr, "dbLoadTemplate: Out of memory!\n");
-		return -1;
-	}
+    vars = (char**)malloc(VAR_MAX_VARS * sizeof(char*));
+    sub_collect = malloc(VAR_MAX_VAR_STRING);
+    if (!vars || !sub_collect) {
+        free(vars);
+        free(sub_collect);
+        fclose(fp);
+        fprintf(stderr, "dbLoadTemplate: Out of memory!\n");
+        return -1;
+    }
 
-	sub_collect[0]='\0';
-	var_count=0;
-	sub_count=0;
+    sub_collect[0] = '\0';
+    var_count = 0;
+    sub_count = 0;
 
-	if(is_not_inited)
-	{
-		yyin=fp;
-		is_not_inited=0;
-	}
-	else
-	{
-		yyrestart(fp);
-	}
+    if (is_not_inited) {
+        yyin = fp;
+        is_not_inited = 0;
+    } else {
+        yyrestart(fp);
+    }
 
-	yyparse();
-	for(ind=0;ind<var_count;ind++) dbmfFree(vars[ind]);
-	free(vars);
-	free(sub_collect);
-	vars = NULL;
-	fclose(fp);
-	if(db_file_name){
-	    dbmfFree((void *)db_file_name);
-	    db_file_name = NULL;
-	}
-	return 0;
+    yyparse();
+
+    for (ind = 0; ind < var_count; ind++) {
+        dbmfFree(vars[ind]);
+    }
+    free(vars);
+    free(sub_collect);
+    vars = NULL;
+    fclose(fp);
+    if (db_file_name) {
+        dbmfFree(db_file_name);
+        db_file_name = NULL;
+    }
+    return 0;
 }
-
diff --git a/src/dbtools/dbLoadTemplate_lex.l b/src/dbtools/dbLoadTemplate_lex.l
index 20140a79e..06b4f22da 100644
--- a/src/dbtools/dbLoadTemplate_lex.l
+++ b/src/dbtools/dbLoadTemplate_lex.l
@@ -18,39 +18,39 @@ bareword    [a-zA-Z0-9_\-+:./\\\[\]<>;]
 
 %%
 
-"pattern" { return(PATTERN);	}
-"file"    { return(DBFILE);	}
+"pattern" { return(PATTERN);    }
+"file"    { return(DBFILE);     }
 
 {doublequote}({dstringchar}|{escape})*{doublequote} |
 {singlequote}({sstringchar}|{escape})*{singlequote} {
-	yylval.Str = dbmfStrdup(yytext+1);
-	yylval.Str[strlen(yylval.Str)-1] = '\0';
-	return(QUOTE);
-    }
+    yylval.Str = dbmfStrdup(yytext+1);
+    yylval.Str[strlen(yylval.Str)-1] = '\0';
+    return(QUOTE);
+}
 
 {bareword}+ {
-	yylval.Str = dbmfStrdup(yytext);
-	return(WORD);
-    }
+    yylval.Str = dbmfStrdup(yytext);
+    return(WORD);
+}
 
-"="	{ return(EQUALS);	}
-","	{ return(COMMA);	}
-"{"	{ return(O_BRACE);	}
-"}"	{ return(C_BRACE);	}
+"="     { return(EQUALS);       }
+","     { return(COMMA);        }
+"{"     { return(O_BRACE);      }
+"}"     { return(C_BRACE);      }
 
-{comment}.*	;
-{whitespace}	;
-{newline}	{ line_num++;	}
+{comment}.*     ;
+{whitespace}    ;
+{newline}       { line_num++;   }
 
 . {
-	char message[40];
+    char message[40];
 
-	sprintf(message,"invalid character '%c'", yytext[0]);
-	yyerror(message);
+    sprintf(message, "invalid character '%c'", yytext[0]);
+    yyerror(message);
 
-	/* Suppress compiler warning messages */
-	if (0) yyunput('c',NULL);
-	if (0) yy_switch_to_buffer(NULL);
-    }
+    /* Suppress compiler warning messages */
+    if (0) yyunput('c',NULL);
+    if (0) yy_switch_to_buffer(NULL);
+}
 
 %%