diff --git a/lapack/tpls/KokkosLapack_Host_tpl.cpp b/lapack/tpls/KokkosLapack_Host_tpl.cpp
index 065b68f2b4..add0a802bd 100644
--- a/lapack/tpls/KokkosLapack_Host_tpl.cpp
+++ b/lapack/tpls/KokkosLapack_Host_tpl.cpp
@@ -42,22 +42,26 @@ void F77_BLAS_MANGLE(zgesv, ZGESV)(int*, int*, std::complex<double>*, int*,
 /// Gesvd
 ///
 
-void F77_BLAS_MANGLE(sgesvd, SGESVD)(const char*, const char*, const int*, const int*,
-                                     float*, const int*, float*, float*, const int*, float*,
-                                     const int*, float*, int*, int*);
-void F77_BLAS_MANGLE(dgesvd, DGESVD)(const char*, const char*, const int*, const int*,
-                                     double*, const int*, double*, double*, const int*,
-                                     double*, const int*, double*, int*, int*);
-void F77_BLAS_MANGLE(cgesvd, CGESVD)(const char*, const char*, const int*, const int*,
-                                     std::complex<float>*, const int*, float*,
-                                     std::complex<float>*, const int*,
-                                     std::complex<float>*, const int*,
-                                     std::complex<float>*, int*, float*, int*);
-void F77_BLAS_MANGLE(zgesvd,
-                     ZGESVD)(const char*, const char*, const int*, const int*,
-                             std::complex<double>*, const int*, double*,
-                             std::complex<double>*, const int*, std::complex<double>*,
-                             const int*, std::complex<double>*, int*, double*, int*);
+void F77_BLAS_MANGLE(sgesvd, SGESVD)(const char*, const char*, const int*,
+                                     const int*, float*, const int*, float*,
+                                     float*, const int*, float*, const int*,
+                                     float*, int*, int*);
+void F77_BLAS_MANGLE(dgesvd, DGESVD)(const char*, const char*, const int*,
+                                     const int*, double*, const int*, double*,
+                                     double*, const int*, double*, const int*,
+                                     double*, int*, int*);
+void F77_BLAS_MANGLE(cgesvd, CGESVD)(const char*, const char*, const int*,
+                                     const int*, std::complex<float>*,
+                                     const int*, float*, std::complex<float>*,
+                                     const int*, std::complex<float>*,
+                                     const int*, std::complex<float>*, int*,
+                                     float*, int*);
+void F77_BLAS_MANGLE(zgesvd, ZGESVD)(const char*, const char*, const int*,
+                                     const int*, std::complex<double>*,
+                                     const int*, double*, std::complex<double>*,
+                                     const int*, std::complex<double>*,
+                                     const int*, std::complex<double>*, int*,
+                                     double*, int*);
 
 ///
 /// Trtri
@@ -108,9 +112,10 @@ void HostLapack<float>::gesv(int n, int rhs, float* a, int lda, int* ipiv,
   F77_FUNC_SGESV(&n, &rhs, a, &lda, ipiv, b, &ldb, &info);
 }
 template <>
-void HostLapack<float>::gesvd(const char jobu, const char jobvt, const int m, const int n,
-                              float* a, const int lda, float* s, float* u, const int ldu,
-                              float* vt, const int ldvt, float* work, int lwork,
+void HostLapack<float>::gesvd(const char jobu, const char jobvt, const int m,
+                              const int n, float* a, const int lda, float* s,
+                              float* u, const int ldu, float* vt,
+                              const int ldvt, float* work, int lwork,
                               float* /*rwork*/, int info) {
   F77_FUNC_SGESVD(&jobu, &jobvt, &m, &n, a, &lda, s, u, &ldu, vt, &ldvt, work,
                   &lwork, &info);
@@ -133,10 +138,11 @@ void HostLapack<double>::gesv(int n, int rhs, double* a, int lda, int* ipiv,
   F77_FUNC_DGESV(&n, &rhs, a, &lda, ipiv, b, &ldb, &info);
 }
 template <>
-void HostLapack<double>::gesvd(const char jobu, const char jobvt, const int m, const int n,
-                               double* a, const int lda, double* s, double* u,
-                               const int ldu, double* vt, const int ldvt, double* work,
-                               int lwork, double* /*rwork*/, int info) {
+void HostLapack<double>::gesvd(const char jobu, const char jobvt, const int m,
+                               const int n, double* a, const int lda, double* s,
+                               double* u, const int ldu, double* vt,
+                               const int ldvt, double* work, int lwork,
+                               double* /*rwork*/, int info) {
   F77_FUNC_DGESVD(&jobu, &jobvt, &m, &n, a, &lda, s, u, &ldu, vt, &ldvt, work,
                   &lwork, &info);
 }
@@ -161,9 +167,10 @@ void HostLapack<std::complex<float> >::gesv(int n, int rhs,
 }
 template <>
 void HostLapack<std::complex<float> >::gesvd(
-    const char jobu, const char jobvt, const int m, const int n, std::complex<float>* a,
-    const int lda, float* s, std::complex<float>* u, const int ldu, std::complex<float>* vt,
-    const int ldvt, std::complex<float>* work, int lwork, float* rwork, int info) {
+    const char jobu, const char jobvt, const int m, const int n,
+    std::complex<float>* a, const int lda, float* s, std::complex<float>* u,
+    const int ldu, std::complex<float>* vt, const int ldvt,
+    std::complex<float>* work, int lwork, float* rwork, int info) {
   F77_FUNC_CGESVD(&jobu, &jobvt, &m, &n, a, &lda, s, u, &ldu, vt, &ldvt, work,
                   &lwork, rwork, &info);
 }
@@ -189,10 +196,10 @@ void HostLapack<std::complex<double> >::gesv(int n, int rhs,
 }
 template <>
 void HostLapack<std::complex<double> >::gesvd(
-    const char jobu, const char jobvt, const int m, const int n, std::complex<double>* a,
-    const int lda, double* s, std::complex<double>* u, const int ldu,
-    std::complex<double>* vt, const int ldvt, std::complex<double>* work, int lwork,
-    double* rwork, int info) {
+    const char jobu, const char jobvt, const int m, const int n,
+    std::complex<double>* a, const int lda, double* s, std::complex<double>* u,
+    const int ldu, std::complex<double>* vt, const int ldvt,
+    std::complex<double>* work, int lwork, double* rwork, int info) {
   F77_FUNC_ZGESVD(&jobu, &jobvt, &m, &n, a, &lda, s, u, &ldu, vt, &ldvt, work,
                   &lwork, rwork, &info);
 }
diff --git a/lapack/tpls/KokkosLapack_Host_tpl.hpp b/lapack/tpls/KokkosLapack_Host_tpl.hpp
index 45eeca421d..9eca83afea 100644
--- a/lapack/tpls/KokkosLapack_Host_tpl.hpp
+++ b/lapack/tpls/KokkosLapack_Host_tpl.hpp
@@ -33,8 +33,9 @@ struct HostLapack {
   static void gesv(int n, int rhs, T *a, int lda, int *ipiv, T *b, int ldb,
                    int info);
 
-  static void gesvd(const char jobu, const char jobvt, const int m, const int n, T *A,
-                    const int lda, typename Kokkos::ArithTraits<T>::mag_type *S, T *U,
+  static void gesvd(const char jobu, const char jobvt, const int m, const int n,
+                    T *A, const int lda,
+                    typename Kokkos::ArithTraits<T>::mag_type *S, T *U,
                     const int ldu, T *Vt, const int ldvt, T *work, int lwork,
                     typename Kokkos::ArithTraits<T>::mag_type *rwork, int info);