diff --git a/bin/main.cpp b/bin/main.cpp
index c85e356..98371d5 100644
--- a/bin/main.cpp
+++ b/bin/main.cpp
@@ -58,7 +58,6 @@
 // This main file is simply a driver
 int main( int argc, char *argv[] )
 {
-
     MPI_Init( &argc, &argv );
 
     {
diff --git a/src/comm_mpi.h b/src/comm_mpi.h
index 05ff61c..13e4156 100644
--- a/src/comm_mpi.h
+++ b/src/comm_mpi.h
@@ -323,7 +323,6 @@ class Comm
     KOKKOS_INLINE_FUNCTION
     void operator()( const TagHaloPBC, const T_INT &i ) const
     {
-
         switch ( phase )
         {
         case 0:
diff --git a/src/comm_mpi_impl.h b/src/comm_mpi_impl.h
index 0a1983e..d72a1a0 100644
--- a/src/comm_mpi_impl.h
+++ b/src/comm_mpi_impl.h
@@ -191,7 +191,6 @@ void Comm<t_System>::reduce_min_float( T_FLOAT *vals, T_INT count )
 template <class t_System>
 void Comm<t_System>::exchange()
 {
-
     Kokkos::Profiling::pushRegion( "Comm::exchange" );
 
     N_local = system->N_local;
@@ -277,7 +276,6 @@ void Comm<t_System>::exchange()
 template <class t_System>
 void Comm<t_System>::exchange_halo()
 {
-
     Kokkos::Profiling::pushRegion( "Comm::exchange_halo" );
 
     N_local = system->N_local;
@@ -367,7 +365,6 @@ void Comm<t_System>::exchange_halo()
 template <class t_System>
 void Comm<t_System>::update_halo()
 {
-
     Kokkos::Profiling::pushRegion( "Comm::update_halo" );
 
     N_local = system->N_local;
@@ -409,7 +406,6 @@ void Comm<t_System>::update_halo()
 template <class t_System>
 void Comm<t_System>::update_force()
 {
-
     Kokkos::Profiling::pushRegion( "Comm::update_force" );
 
     N_local = system->N_local;
diff --git a/src/inputFile_impl.h b/src/inputFile_impl.h
index 4023615..e5803f4 100644
--- a/src/inputFile_impl.h
+++ b/src/inputFile_impl.h
@@ -60,10 +60,10 @@ std::vector<std::string> split( const std::string &line )
     std::sregex_token_iterator first{ line.begin(), line.end(), re, -1 }, last;
     std::vector<std::string> words{ first, last };
     // Remove empty
-    words.erase(
-        std::remove_if( words.begin(), words.end(),
-                        []( std::string const &s ) { return s.empty(); } ),
-        words.end() );
+    words.erase( std::remove_if( words.begin(), words.end(),
+                                 []( std::string const &s )
+                                 { return s.empty(); } ),
+                 words.end() );
     return words;
 }
 
diff --git a/src/output.h b/src/output.h
index e709986..ce810ae 100644
--- a/src/output.h
+++ b/src/output.h
@@ -27,7 +27,7 @@ void log( t_stream &stream, t_last &&last )
 }
 
 template <class t_stream, class t_head, class... t_tail>
-void log( t_stream &stream, t_head &&head, t_tail &&... tail )
+void log( t_stream &stream, t_head &&head, t_tail &&...tail )
 {
     if ( print_rank() )
         stream << head;
@@ -46,7 +46,7 @@ void log_err( t_stream &stream, t_last &&last )
 }
 
 template <class t_stream, class t_head, class... t_tail>
-void log_err( t_stream &stream, t_head &&head, t_tail &&... tail )
+void log_err( t_stream &stream, t_head &&head, t_tail &&...tail )
 {
     if ( print_rank() )
         stream << head;