1 files changed, 4 insertions, 9 deletions
diff --git a/src/main/command_executor.cpp b/src/main/command_executor.cpp
index 1bffd5e35..d283b2743 100644
--- a/src/main/command_executor.cpp
+++ b/src/main/command_executor.cpp
@@ -24,16 +24,11 @@
 namespace CVC4 {
 namespace main {
 
-
 CommandExecutor::CommandExecutor(ExprManager &exprMgr, Options &options):
   d_exprMgr(exprMgr),
   d_smtEngine(SmtEngine(&exprMgr)),
-  d_options(options) {
-  
-  // signal handlers need access
-  main::pStatistics = d_smtEngine.getStatisticsRegistry();
-  d_exprMgr.getStatisticsRegistry()->setName("ExprManager");
-  main::pStatistics->registerStat_(d_exprMgr.getStatisticsRegistry());
+  d_options(options),
+  d_stats("driver") {
 }
 
 bool CommandExecutor::doCommand(Command* cmd)
@@ -89,5 +84,5 @@ bool smtEngineInvoke(SmtEngine* smt, Command* cmd, std::ostream *out)
   return !cmd->fail();
 }
 
-}/*main namespace*/
-}/*CVC4 namespace*/
+}/* CVC4::main namespace */
+}/* CVC4 namespace */