diff --git a/main.cpp b/main.cpp
index 18ba74a311fa257344cdaebdce3a04c2f04644c5..4a7f3254645900d364c8bee1ebacf42273d74bb5 100644
--- a/main.cpp
+++ b/main.cpp
@@ -123,34 +123,35 @@ void computeExplicitFluxes(const Kokkos::View<double*>& xr,
 
 int main(int argc, char *argv[])
 {
-  CLI::App app{"Pastis help"};
-
   long unsigned number = 10;
-  app.add_option("number,-n,--number", number, "Number of cells");//->required();
-  bool disable_fpe = false;
-  app.add_flag("--no-fpe", disable_fpe, "Do not trap floating point exceptions");
-  bool disable_signals = false;
-  app.add_flag("--no-signal", disable_signals, "Do not catches signals");
-
-  std::string colorize="auto";
-  app.add_set("--colorize", colorize, {"auto", "yes", "no"}, "Colorize console output", true);
-
-  int threads=-1;
-  app.add_option("--threads", threads, "Number of Kokkos threads")->check(CLI::Range(1,std::numeric_limits<decltype(threads)>::max()));
-
-  std::atexit([](){std::cout << rang::style::reset;});
-  try {
-    app.parse(argc, argv);
-  } catch (const CLI::ParseError &e) {
-    return app.exit(e);
-  }
 
-  ConsoleManager::init(colorize);
-  FPEManager::init(not disable_fpe);
-  SignalManager::init(not disable_signals);
-  
+  {
+    CLI::App app{"Pastis help"};
+
+    app.add_option("number,-n,--number", number, "Number of cells");//->required();
+    bool disable_fpe = false;
+    app.add_flag("--no-fpe", disable_fpe, "Do not trap floating point exceptions");
+    bool disable_signals = false;
+    app.add_flag("--no-signal", disable_signals, "Do not catches signals");
+
+    std::string colorize="auto";
+    app.add_set("--colorize", colorize, {"auto", "yes", "no"}, "Colorize console output", true);
 
-  std::cout << "colorize=" << colorize << '\n';
+    int threads=-1;
+    app.add_option("--threads", threads, "Number of Kokkos threads")->check(CLI::Range(1,std::numeric_limits<decltype(threads)>::max()));
+
+    std::atexit([](){std::cout << rang::style::reset;});
+    try {
+      app.parse(argc, argv);
+    } catch (const CLI::ParseError &e) {
+      return app.exit(e);
+    }
+
+    ConsoleManager::init(colorize);
+    FPEManager::init(not disable_fpe);
+    SignalManager::init(not disable_signals);
+  }
+  
   std::cout << "Code version: "
 	    << rang::style::bold << RevisionInfo::version() << rang::style::reset << '\n';
 
@@ -164,6 +165,7 @@ int main(int argc, char *argv[])
 	    << rang::style::bold << RevisionInfo::gitTag() << rang::style::reset << '\n';
   std::cout << "HEAD: " << rang::style::bold << RevisionInfo::gitHead() << rang::style::reset << '\n';
   std::cout << "hash: " << rang::style::bold << RevisionInfo::gitHash() << rang::style::reset << "  (";
+
   if (RevisionInfo::gitIsClean()) {
     std::cout << rang::fgB::green << "clean" << rang::fg::reset;
   } else {