diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 7ef6c0ba7..228c9b96e 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -4,7 +4,8 @@ For more detailed information about the changes see the history of the
 Version 2021.2 (released XX.07.21)
 ==================================
 
--  made masses in test more accurate. (#705)
+-  made masses in test more accurate (#705)
+-  format code with clang-12.0.1 (#707)
 
 Version 2021.1 (released 18.07.21)
 ==================================
diff --git a/src/csgapps/orientcorr/orientcorr.cc b/src/csgapps/orientcorr/orientcorr.cc
index d8c7a78e5..c5736a3b6 100644
--- a/src/csgapps/orientcorr/orientcorr.cc
+++ b/src/csgapps/orientcorr/orientcorr.cc
@@ -115,12 +115,11 @@ void OrientCorrApp::Initialize() {
       "cutoff for the neighbor search")(
       "nbins",
       boost::program_options::value<votca::Index>(&_nbins)->default_value(40),
-      "number of bins for the grid")("nbmethod",
-                                     boost::program_options::value<string>(
-                                         &_nbmethod)
-                                         ->default_value("grid"),
-                                     "neighbor search algorithm (simple or "
-                                     "grid)");
+      "number of bins for the grid")(
+      "nbmethod",
+      boost::program_options::value<string>(&_nbmethod)->default_value("grid"),
+      "neighbor search algorithm (simple or "
+      "grid)");
 }
 
 NBList *OrientCorrApp::CreateNBSearch() {
diff --git a/src/tools/csg_map.cc b/src/tools/csg_map.cc
index 97c838b7e..43ad8bbc0 100644
--- a/src/tools/csg_map.cc
+++ b/src/tools/csg_map.cc
@@ -55,19 +55,19 @@ class CsgMapApp : public CsgApplication {
     CsgApplication::Initialize();
     AddProgramOptions()("out", boost::program_options::value<string>(),
                         "  output file for coarse-grained trajectory")(
-        "vel",
-        "  Write mapped velocities (if available)")("force",
-                                                    "  Write mapped forces (if "
-                                                    "available)")("hybrid",
-                                                                  "  Create "
-                                                                  "hybrid "
-                                                                  "trajectory "
-                                                                  "containing "
-                                                                  "both "
-                                                                  "atomistic "
-                                                                  "and "
-                                                                  "coarse-"
-                                                                  "grained");
+        "vel", "  Write mapped velocities (if available)")(
+        "force",
+        "  Write mapped forces (if "
+        "available)")("hybrid",
+                      "  Create "
+                      "hybrid "
+                      "trajectory "
+                      "containing "
+                      "both "
+                      "atomistic "
+                      "and "
+                      "coarse-"
+                      "grained");
   }
 
   bool EvaluateOptions() override {
diff --git a/src/tools/csg_stat.cc b/src/tools/csg_stat.cc
index be5f03323..599b02e56 100644
--- a/src/tools/csg_stat.cc
+++ b/src/tools/csg_stat.cc
@@ -71,26 +71,20 @@ void CsgStatApp::Initialize() {
   AddProgramOptions("Specific options")("options",
                                         boost::program_options::value<string>(),
                                         "  options file for coarse graining")(
-      "do-imc",
-      "  write out additional Inverse Monte Carlo data")("block-length",
-                                                         boost::program_options::
-                                                             value<votca::
-                                                                       Index>(),
-                                                         "  write blocks of "
-                                                         "this length, the "
-                                                         "averages are cleared "
-                                                         "after every "
-                                                         "write")("ext",
-                                                                  boost::program_options::value<
-                                                                      string>(
-                                                                      &_extension)
-                                                                      ->default_value(
-                                                                          "dist"
-                                                                          ".ne"
-                                                                          "w"),
-                                                                  "Extension "
-                                                                  "of the "
-                                                                  "output");
+      "do-imc", "  write out additional Inverse Monte Carlo data")(
+      "block-length", boost::program_options::value<votca::Index>(),
+      "  write blocks of "
+      "this length, the "
+      "averages are cleared "
+      "after every "
+      "write")("ext",
+               boost::program_options::value<string>(&_extension)
+                   ->default_value("dist"
+                                   ".ne"
+                                   "w"),
+               "Extension "
+               "of the "
+               "output");
 }
 
 bool CsgStatApp::EvaluateOptions() {