diff --git a/src/parse.cpp b/src/parse.cpp
--- a/src/parse.cpp
+++ b/src/parse.cpp
@@ -37,39 +37,38 @@ char *ParsePar(FILE *fp, char *parameter
 {
   char *line,*token;
   char *value;
-  
+
   line=SearchToken(fp,parameter, wrapflag);
   if (line==NULL) {
     warning("Warning: Token %s not found.",parameter);
     value=0;
     return value;
   }
-  
+
   /* parse the line on = sign */
   token=strtok(line,"=");
   if (token==NULL) {
-	error("Parse error: no '=' sign found next to token %s, in line: \n %s.",
-		  parameter,line);
-   }
+    error("Parse error: no '=' sign found next to token %s, in line: \n %s.",
+	  parameter,line);
+  }
 
   // warning("Reading value for token %s...",token);
   fprintf(stderr, "[%s = ",token);
-  
+
   token=strtok(NULL,"=");
   if (token==NULL)
-	error("\nParse error: no value found after '=' sign, in line: \n %s",
-		  line);
+    error("\nParse error: no value found after '=' sign, in line: \n %s",
+	  line);
 
   value=strdup(token);
   free(line);
-  
+
   return value;
-      
 }
 
 
 int igetpar(FILE *fp,char *parameter, bool wrapflag) {
-  
+
   // overloaded compatibility function. Doesn't need default parameter
 
   return igetpar(fp, parameter, 0, wrapflag);
@@ -79,7 +78,7 @@ int igetpar(FILE *fp,char *parameter, in
 {
   char *token;
   int value;
-  
+
   /* Get token representing the value */
   token=ParsePar(fp,parameter, wrapflag);
 
@@ -91,15 +90,14 @@ int igetpar(FILE *fp,char *parameter, in
   /* read it */
   sscanf(token,"%d",&value);
   fprintf(stderr, "%d]\n",value);
-  
+
   free(token);
 
   return value;
-  
 }
 
 float fgetpar(FILE *fp,char *parameter, bool wrapflag) {
-   
+
   // overloaded compatibility function. Doesn't need default parameter
   return fgetpar(fp, parameter, 0., wrapflag);
 }
@@ -120,13 +118,9 @@ float fgetpar(FILE *fp, char *parameter,
 
   /* read it */
   sscanf(token,"%e",&value);
-
   fprintf(stderr,"%e]\n",value);
-  
   free(token);
-
   return value;
-  
 }
 
 
@@ -139,48 +133,47 @@ double *dgetparlist(FILE *fp,char *param
   int i;
 
   value=(double *)malloc(n*sizeof(double));
-  
+
   /* Get token representing the value */
   token=ParsePar(fp,parameter, wrapflag);
-  
+
   if (token==0) {
     error("No token %s found.\n", parameter);
   }
   /* parse it */
   number=strtok(token,","); /* make a pointer to "token" */
-  
+
   i=0;
   while (number!=NULL) {
-    
+
     if (i>=n) {
       error("\nToo many values found for parameterlist '%s' (%d expected).",parameter,n);
     }
-    
+
     sscanf(number,"%le",&value[i]);
     fprintf(stderr,"[%f]",value[i]);
-    
+
     /* next value */
     number=strtok(NULL,",");
     i++;
   }
-  
+
   fprintf(stderr,"]\n");
-  
+
   if (i<n) {
     warning("Too few values found for parameterlist '%s' (%d expected).", parameter,n);
     warning("Padding with 0.");
     for (int j=i;j<n;j++) 
       value[j]=0.;
-    
+
     fprintf(stderr, "Full array is ");
     for (int i=0;i<n;i++) {
       fprintf(stderr," %lf ",value[i]);
     }
     fprintf(stderr, "\n");
   }
-  
+
   return value;
-  
 }
 
 char *sgetpar(FILE *fp,char *parameter, bool wrapflag) 
@@ -193,7 +186,7 @@ char *sgetpar(FILE *fp, char *parameter,
   char *token;
   char *value;
   int pos;
-    
+
   /* Get token representing the value */
   token=ParsePar(fp,parameter, wrapflag);
 
@@ -203,7 +196,7 @@ char *sgetpar(FILE *fp, char *parameter,
     value=strdup(default_val);
     return value;
   }
-  
+
   /* strip leading spaces and duplicate string */
   pos=strspn(token," \t\n");
   value=(char *)malloc((strlen(&token[pos])+1)*sizeof(char));
@@ -213,14 +206,13 @@ char *sgetpar(FILE *fp, char *parameter,
   fprintf(stderr,"%s]\n",value);
 
   return value;
-  
 }
 
 char *bool_str(bool bool_var) {
-  
+
   /* Return string "true" if bool_var=true */
   /* Return string "false" if bool_var=false */
-  
+
   static char t[5] = "true";
   static char f[6] = "false";
 
@@ -229,16 +221,14 @@ char *bool_str(bool bool_var) {
   } else {
     return f;
   }
-  
 }
 
 bool bgetpar(FILE *fp, char *parameter,  bool wrapflag) {
-  
+
   // overloaded compatibility function. Doesn't need default parameter
   // default = false
 
   return bgetpar(fp, parameter, 0, wrapflag);
-
 }
 
 bool bgetpar(FILE *fp, char *parameter, int default_val, bool wrapflag) {
@@ -251,7 +241,7 @@ bool bgetpar(FILE *fp, char *parameter, 
   char *token;
   int value=0;
   int pos;
-    
+
   /* Get token representing the value */
   token=ParsePar(fp,parameter, wrapflag);
 
@@ -261,22 +251,21 @@ bool bgetpar(FILE *fp, char *parameter, 
     return default_val;
   }
 
-    
+
   /* strip leading spaces */
   pos=strspn(token," \t\n");
-  
+
   if (!strcmp(&token[pos],"yes") || !strcmp(&token[pos],"true") || !strcmp(&token[pos],"1"))
     value=1;
   else 
     if (!strcmp(&token[pos],"no") || !strcmp(&token[pos],"false") || !strcmp(&token[pos],"0"))
       value=0;
-  else
-    error("Keyword '%s' not recognized. Try yes/no or true/false.\n",&token[pos]);
+    else
+      error("Keyword '%s' not recognized. Try yes/no or true/false.\n",&token[pos]);
 
   fprintf(stderr, "%s]\n",bool_str(value));
 
   return value;
-
 }
 
 
@@ -286,33 +275,33 @@ char *SearchToken(FILE *fp, char *token,
      the string stored in the null terminated string token */
 
   /* remember to free the memory allocated for line */
-  
+
   unsigned int len;
   char *line;
   int wrapped=false;
   long initial_position;
-  
+
   char *tokenplusspace = (char *)malloc( (strlen(token)+3)*sizeof(char));
   strcpy(tokenplusspace, token);
   strcat(tokenplusspace," ");
-  
+
   initial_position=ftell(fp);
   if (ferror(fp)) /* error occured */
     {
       error("%s",strerror(errno));
     }
 
- 
+
   if (feof(fp)) {
     warning("End of file\n");
   }
-  
-  
+
+
   while (!(wrapped && ftell(fp)>=initial_position)) {
 
     /* As long as the search was not wrapped and we are not
      * back to where we were, continue searching */
-		
+
     /* Read a line, and check whether an EOF was found */
     if ((line=ReadLine(fp))==NULL) {
       /* Yes? wrapflag on? => Wrap. */
@@ -328,10 +317,10 @@ char *SearchToken(FILE *fp, char *token,
     int pos=strspn(line," \t\n");
 
     if (line[pos]=='#') {
-     
+
       continue;
     } 
-    
+
     len=strlen(line);
     if (strlen(tokenplusspace)<=len) {
 
@@ -343,10 +332,8 @@ char *SearchToken(FILE *fp, char *token,
 	  return line;
 	}
     }
-    
 
     free(line);
-    
   }
   free(tokenplusspace);
   return NULL; /* Token Not Found in the file */
@@ -362,30 +349,29 @@ int TokenInLineP(char *line,char *token)
 
 
 void SkipLine(FILE *fp) {
-  
+
   /* Just skips a line in FILE *fp */
   char *tmpstring;
   tmpstring=ReadLine(fp);
   free(tmpstring);
-  
 }
 
 void SkipToken(FILE *fp,char *token, bool wrapflag)
 {
   /* A very simple function:
-	 call SearchToken() and get rid of the memory returned by
+     call SearchToken() and get rid of the memory returned by
      it.
-	 Also, return an error if the desired token was not found in the file.
+     Also, return an error if the desired token was not found in the file.
   */
   char *tmppointer;
 
   tmppointer=SearchToken(fp,token, wrapflag);
 
   if (tmppointer==NULL) {
-	error("Token `%s' not found by function SkipToken.\n",token);
+    error("Token `%s' not found by function SkipToken.\n",token);
   }
 
   free(tmppointer);
-      
 }
 
+/* finis */