diff --git a/unittest/force-styles/angle_style.cpp b/unittest/force-styles/angle_style.cpp
index f5299d5b0e..8b71263e7f 100644
--- a/unittest/force-styles/angle_style.cpp
+++ b/unittest/force-styles/angle_style.cpp
@@ -95,10 +95,10 @@ LAMMPS *init_lammps(int argc, char **argv,
     }
 
     // utility lambdas to improve readability
-    auto command = [&](const std::string & line){ 
+    auto command = [&](const std::string & line) {
         lmp->input->one(line.c_str());
     };
-    auto parse_input_script = [&](const std::string & filename){
+    auto parse_input_script = [&](const std::string & filename) {
         lmp->input->file(filename.c_str());
     };
 
@@ -138,7 +138,7 @@ LAMMPS *init_lammps(int argc, char **argv,
 void run_lammps(LAMMPS *lmp)
 {
     // utility lambda to improve readability
-    auto command = [&](const std::string & line){ 
+    auto command = [&](const std::string & line) {
         lmp->input->one(line.c_str());
     };
 
@@ -153,7 +153,7 @@ void run_lammps(LAMMPS *lmp)
 void restart_lammps(LAMMPS *lmp, const TestConfig &cfg)
 {
     // utility lambda to improve readability
-    auto command = [&](const std::string & line){ 
+    auto command = [&](const std::string & line) {
         lmp->input->one(line.c_str());
     };
 
@@ -181,10 +181,10 @@ void restart_lammps(LAMMPS *lmp, const TestConfig &cfg)
 void data_lammps(LAMMPS *lmp, const TestConfig &cfg)
 {
     // utility lambdas to improve readability
-    auto command = [&](const std::string & line){ 
+    auto command = [&](const std::string & line) {
         lmp->input->one(line.c_str());
     };
-    auto parse_input_script = [&](const std::string & filename){
+    auto parse_input_script = [&](const std::string & filename) {
         lmp->input->file(filename.c_str());
     };
 
diff --git a/unittest/force-styles/bond_style.cpp b/unittest/force-styles/bond_style.cpp
index d44eec995d..75c88ae668 100644
--- a/unittest/force-styles/bond_style.cpp
+++ b/unittest/force-styles/bond_style.cpp
@@ -95,10 +95,10 @@ LAMMPS *init_lammps(int argc, char **argv,
     }
 
     // utility lambdas to improve readability
-    auto command = [&](const std::string & line){
+    auto command = [&](const std::string & line) {
         lmp->input->one(line.c_str());
     };
-    auto parse_input_script = [&](const std::string & filename){
+    auto parse_input_script = [&](const std::string & filename) {
         lmp->input->file(filename.c_str());
     };
 
@@ -138,7 +138,7 @@ LAMMPS *init_lammps(int argc, char **argv,
 void run_lammps(LAMMPS *lmp)
 {
     // utility lambda to improve readability
-    auto command = [&](const std::string & line){
+    auto command = [&](const std::string & line) {
         lmp->input->one(line.c_str());
     };
 
@@ -153,7 +153,7 @@ void run_lammps(LAMMPS *lmp)
 void restart_lammps(LAMMPS *lmp, const TestConfig &cfg)
 {
     // utility lambda to improve readability
-    auto command = [&](const std::string & line){
+    auto command = [&](const std::string & line) {
         lmp->input->one(line.c_str());
     };
 
@@ -181,10 +181,10 @@ void restart_lammps(LAMMPS *lmp, const TestConfig &cfg)
 void data_lammps(LAMMPS *lmp, const TestConfig &cfg)
 {
     // utility lambdas to improve readability
-    auto command = [&](const std::string & line){
+    auto command = [&](const std::string & line) {
         lmp->input->one(line.c_str());
     };
-    auto parse_input_script = [&](const std::string & filename){
+    auto parse_input_script = [&](const std::string & filename) {
         lmp->input->file(filename.c_str());
     };
 
@@ -782,7 +782,7 @@ TEST(BondStyle, single) {
     }
 
     // utility lambda to improve readability
-    auto command = [&](const std::string & line){
+    auto command = [&](const std::string & line) {
         lmp->input->one(line.c_str());
     };
 
diff --git a/unittest/force-styles/pair_style.cpp b/unittest/force-styles/pair_style.cpp
index 50e1c010c8..ec8645c65e 100644
--- a/unittest/force-styles/pair_style.cpp
+++ b/unittest/force-styles/pair_style.cpp
@@ -95,10 +95,10 @@ LAMMPS *init_lammps(int argc, char **argv,
     }
 
     // utility lambdas to improve readability
-    auto command = [&](const std::string & line){
+    auto command = [&](const std::string & line) {
         lmp->input->one(line.c_str());
     };
-    auto parse_input_script = [&](const std::string & filename){
+    auto parse_input_script = [&](const std::string & filename) {
         lmp->input->file(filename.c_str());
     };
 
@@ -138,7 +138,7 @@ LAMMPS *init_lammps(int argc, char **argv,
 void run_lammps(LAMMPS *lmp)
 {
     // utility lambda to improve readability
-    auto command = [&](const std::string & line){
+    auto command = [&](const std::string & line) {
         lmp->input->one(line.c_str());
     };
 
@@ -153,7 +153,7 @@ void run_lammps(LAMMPS *lmp)
 void restart_lammps(LAMMPS *lmp, const TestConfig &cfg)
 {
     // utility lambda to improve readability
-    auto command = [&](const std::string & line){
+    auto command = [&](const std::string & line) {
         lmp->input->one(line.c_str());
     };
 
@@ -180,10 +180,10 @@ void restart_lammps(LAMMPS *lmp, const TestConfig &cfg)
 void data_lammps(LAMMPS *lmp, const TestConfig &cfg)
 {
     // utility lambdas to improve readability
-    auto command = [&](const std::string & line){
+    auto command = [&](const std::string & line) {
         lmp->input->one(line.c_str());
     };
-    auto parse_input_script = [&](const std::string & filename){
+    auto parse_input_script = [&](const std::string & filename) {
         lmp->input->file(filename.c_str());
     };
 
@@ -1031,7 +1031,7 @@ TEST(PairStyle, single) {
     if (!verbose) ::testing::internal::CaptureStdout();
 
     // utility lambda to improve readability
-    auto command = [&](const std::string & line){
+    auto command = [&](const std::string & line) {
         lmp->input->one(line.c_str());
     };
 
@@ -1249,7 +1249,7 @@ TEST(PairStyle, extract) {
     }
 
     // utility lambda to improve readability
-    auto command = [&](const std::string & line){
+    auto command = [&](const std::string & line) {
         lmp->input->one(line.c_str());
     };
 
diff --git a/unittest/force-styles/test_main.cpp b/unittest/force-styles/test_main.cpp
index 49f3fc4029..afdd650024 100644
--- a/unittest/force-styles/test_main.cpp
+++ b/unittest/force-styles/test_main.cpp
@@ -26,7 +26,7 @@ bool read_yaml_file(const char *infile, TestConfig &config)
     auto reader = TestConfigReader(config);
     if (reader.parse_file(infile))
         return false;
-    
+
     config.basename = reader.get_basename();
     return true;
 }
@@ -45,7 +45,7 @@ void usage(std::ostream &out, const char *name)
         << "  -h                  print this message\n"
         << std::endl;
 }
-    
+
 // test configuration settings read from yaml file
 TestConfig test_config;
 
diff --git a/unittest/force-styles/yaml_reader.h b/unittest/force-styles/yaml_reader.h
index a19d756f9b..90ac395055 100644
--- a/unittest/force-styles/yaml_reader.h
+++ b/unittest/force-styles/yaml_reader.h
@@ -75,7 +75,7 @@ public:
             }
 
             if (accepted) {
-                if(!consume_key_value(key, event)){
+                if(!consume_key_value(key, event)) {
                     std::cerr << "Ignoring unknown key/value pair: " << key
                               << " = " << event.data.scalar.value << std::endl;
                 }
diff --git a/unittest/force-styles/yaml_writer.cpp b/unittest/force-styles/yaml_writer.cpp
index 68c34b1ea0..2581cd6acd 100644
--- a/unittest/force-styles/yaml_writer.cpp
+++ b/unittest/force-styles/yaml_writer.cpp
@@ -48,7 +48,7 @@ YamlWriter::~YamlWriter() {
     fclose(fp);
 }
 
-void YamlWriter::emit(const std::string &key, const double value){
+void YamlWriter::emit(const std::string &key, const double value) {
     yaml_scalar_event_initialize(&event, NULL,
                                  (yaml_char_t *)YAML_STR_TAG,
                                  (yaml_char_t *) key.c_str(),
@@ -65,7 +65,7 @@ void YamlWriter::emit(const std::string &key, const double value){
     yaml_emitter_emit(&emitter, &event);
 }
 
-void YamlWriter::emit(const std::string &key, const long value){
+void YamlWriter::emit(const std::string &key, const long value) {
     yaml_scalar_event_initialize(&event, NULL,
                                  (yaml_char_t *)YAML_STR_TAG,
                                  (yaml_char_t *) key.c_str(),
@@ -82,7 +82,7 @@ void YamlWriter::emit(const std::string &key, const long value){
     yaml_emitter_emit(&emitter, &event);
 }
 
-void YamlWriter::emit(const std::string &key, const int value){
+void YamlWriter::emit(const std::string &key, const int value) {
     yaml_scalar_event_initialize(&event, NULL,
                                  (yaml_char_t *)YAML_STR_TAG,
                                  (yaml_char_t *) key.c_str(),
@@ -115,7 +115,7 @@ void YamlWriter::emit(const std::string &key, const std::string &value)
     yaml_emitter_emit(&emitter, &event);
 }
 
-void YamlWriter::emit_block(const std::string &key, const std::string &value){
+void YamlWriter::emit_block(const std::string &key, const std::string &value) {
     yaml_scalar_event_initialize(&event, NULL,
                                  (yaml_char_t *)YAML_STR_TAG,
                                  (yaml_char_t *) key.c_str(),
diff --git a/unittest/force-styles/yaml_writer.h b/unittest/force-styles/yaml_writer.h
index 041137df3f..cb2c7b97df 100644
--- a/unittest/force-styles/yaml_writer.h
+++ b/unittest/force-styles/yaml_writer.h
@@ -37,7 +37,7 @@ private:
 
 private:
     YamlWriter() {};
-    YamlWriter(const YamlWriter &){};
+    YamlWriter(const YamlWriter &) {};
 };
 
 #endif