diff --git a/include/spm.h b/include/spm.h
index dc66ea3dafa8803d4db944bef328c38d9b65f2f8..f74efe7e60c812baa12c347802cfe0e0bbcc0a02 100644
--- a/include/spm.h
+++ b/include/spm.h
@@ -99,7 +99,7 @@ double      spmNorm( spm_normtype_t ntype, const spmatrix_t *spm );
 int         spmMatVec( spm_trans_t trans, const void *alpha, const spmatrix_t *spm, const void *x, const void *beta, void *y );
 int         spmMatMat( spm_trans_t trans, spm_int_t n,
                        const void *alpha, const spmatrix_t *A,
-                       const void *B, spm_int_t ldb,
+                                          const void *B, spm_int_t ldb,
                        const void *beta,        void *C, spm_int_t ldc );
 void        spmScalMatrix( double alpha, spmatrix_t *spm );
 void        spmScalVector( spm_coeftype_t flt, double alpha, spm_int_t n, void *x, spm_int_t incx );
@@ -148,9 +148,17 @@ int         spmSave( const spmatrix_t *spm, FILE *outfile );
  * @{
  */
 int         spmReadDriver( spm_driver_t  driver,
-                           const char      *filename,
-                           spmatrix_t    *spm,
-                           MPI_Comm         spm_comm );
+                           const char   *filename,
+                           spmatrix_t   *spm );
+
+int         spmParseLaplacianInfo( const char     *filename,
+                                   spm_coeftype_t *flttype,
+                                   spm_int_t      *dim1,
+                                   spm_int_t      *dim2,
+                                   spm_int_t      *dim3,
+                                   double         *alpha,
+                                   double         *beta );
+
 /**
  * @}
  * @name SPM debug subroutines
diff --git a/src/drivers/laplacian.c b/src/drivers/laplacian.c
index 602d55bae087af9cd3d3f0731d8a2b7893a402d4..e5edc26eea1e079867d4c971b5c9d4d808bff85f 100644
--- a/src/drivers/laplacian.c
+++ b/src/drivers/laplacian.c
@@ -51,7 +51,7 @@ laplacian_usage(void)
 /**
  *******************************************************************************
  *
- * @ingroup spm_spm_driver
+ * @ingroup spm
  *
  * @brief Parse information given through the filename string to configure the
  * laplacian matrix to generate.
@@ -92,13 +92,13 @@ laplacian_usage(void)
  *
  *******************************************************************************/
 int
-laplacian_parse_info( const char        *filename,
-                      spm_coeftype_t *flttype,
-                      spm_int_t      *dim1,
-                      spm_int_t      *dim2,
-                      spm_int_t      *dim3,
-                      double            *alpha,
-                      double            *beta )
+spmParseLaplacianInfo( const char     *filename,
+                       spm_coeftype_t *flttype,
+                       spm_int_t      *dim1,
+                       spm_int_t      *dim2,
+                       spm_int_t      *dim3,
+                       double         *alpha,
+                       double         *beta )
 {
     double val1, val2;
     long tmp1, tmp2, tmp3;
@@ -282,7 +282,7 @@ genLaplacian( const char    *filename,
     double beta = 1.;
     int rc;
 
-    rc = laplacian_parse_info(filename, &flttype, &dim1, &dim2, &dim3, &alpha, &beta );
+    rc = spmParseLaplacianInfo(filename, &flttype, &dim1, &dim2, &dim3, &alpha, &beta );
     if (rc != SPM_SUCCESS)
         return rc;
 
@@ -336,7 +336,7 @@ genExtendedLaplacian( const char    *filename,
     double beta = 1.;
     int rc;
 
-    rc = laplacian_parse_info(filename, &flttype, &dim1, &dim2, &dim3, &alpha, &beta);
+    rc = spmParseLaplacianInfo(filename, &flttype, &dim1, &dim2, &dim3, &alpha, &beta);
     if (rc != SPM_SUCCESS)
         return rc;
 
diff --git a/src/drivers/laplacian.h b/src/drivers/laplacian.h
index 423cb49640888bfc6c853ca842cbafb553c82729..2954365eaadb9468dc1ab9162eceb5c8d7f4886d 100644
--- a/src/drivers/laplacian.h
+++ b/src/drivers/laplacian.h
@@ -32,12 +32,4 @@ void d_spmExtendedLaplacian3D( spmatrix_t *spm, spm_int_t dim1, spm_int_t dim2,
 void s_spmExtendedLaplacian3D( spmatrix_t *spm, spm_int_t dim1, spm_int_t dim2, spm_int_t dim3 );
 void p_spmExtendedLaplacian3D( spmatrix_t *spm, spm_int_t dim1, spm_int_t dim2, spm_int_t dim3 );
 
-int laplacian_parse_info( const char        *filename,
-                          spm_coeftype_t *flttype,
-                          spm_int_t      *dim1,
-                          spm_int_t      *dim2,
-                          spm_int_t      *dim3,
-                          double            *alpha,
-                          double            *beta );
-
 #endif /* _laplacian_h_ */