diff --git a/include/engine/bp/BPFileWriter.h b/include/engine/bp/BPFileWriter.h
index c016e781549d865e0eb1fc097d461eaac720c031..558eebbd9572b85a146ebd9fa2c2411a06d3901b 100644
--- a/include/engine/bp/BPFileWriter.h
+++ b/include/engine/bp/BPFileWriter.h
@@ -34,9 +34,9 @@ public:
    * @param method
    * @param debugMode
    */
-  BPFileWriter(ADIOS &adios, std::string name,
-               const std::string &accessMode, MPI_Comm mpiComm,
-               const Method &method, const IOMode iomode = IOMode::INDEPENDENT,
+  BPFileWriter(ADIOS &adios, std::string name, const std::string &accessMode,
+               MPI_Comm mpiComm, const Method &method,
+               const IOMode iomode = IOMode::INDEPENDENT,
                const float timeout_sec = 0., const bool debugMode = false,
                const unsigned int nthreads = 1);
 
diff --git a/source/core/Engine.cpp b/source/core/Engine.cpp
index e6f3cc4ff2ba28895baea53b200bdc1f21c24070..31497911e9f7ad729d17d17a66a87efc8675fd5b 100644
--- a/source/core/Engine.cpp
+++ b/source/core/Engine.cpp
@@ -20,10 +20,10 @@ namespace adios
 Engine::Engine(ADIOS &adios, std::string engineType, std::string name,
                std::string accessMode, MPI_Comm mpiComm, const Method &method,
                bool debugMode, unsigned int nthreads, std::string endMessage)
-: m_MPIComm{mpiComm}, m_EngineType{std::move(engineType)},
-  m_Name{std::move(name)}, m_AccessMode{std::move(accessMode)},
-  m_Method{method}, m_ADIOS{adios}, m_DebugMode{debugMode},
-  m_nThreads{nthreads}, m_EndMessage{std::move(endMessage)}
+: m_MPIComm(mpiComm), m_EngineType(std::move(engineType)),
+  m_Name(std::move(name)), m_AccessMode(std::move(accessMode)),
+  m_Method(method), m_ADIOS(adios), m_DebugMode(debugMode),
+  m_nThreads(nthreads), m_EndMessage(std::move(endMessage))
 {
   if (m_DebugMode == true)
   {
diff --git a/source/engine/bp/BPFileWriter.cpp b/source/engine/bp/BPFileWriter.cpp
index d8a4cea5a5166254fc17e5c0861a9cc09b673584..eb85db8e5b70c4dace2d7e30874b0d715f967fe7 100644
--- a/source/engine/bp/BPFileWriter.cpp
+++ b/source/engine/bp/BPFileWriter.cpp
@@ -9,8 +9,8 @@
  */
 #include <utility>
 
-#include "engine/bp/BPFileWriter.h"
 #include "ADIOS.h"
+#include "engine/bp/BPFileWriter.h"
 
 // supported transports
 #include "transport/file/FStream.h"
@@ -25,12 +25,12 @@ BPFileWriter::BPFileWriter(ADIOS &adios, std::string name,
                            const Method &method, const IOMode /*iomode*/,
                            const float /*timeout_sec*/, const bool debugMode,
                            const unsigned int nthreads)
-: Engine{adios, "BPFileWriter", std::move(name), accessMode, mpiComm, method,
+: Engine(adios, "BPFileWriter", std::move(name), accessMode, mpiComm, method,
          debugMode, nthreads,
-         " BPFileWriter constructor (or call to ADIOS Open).\n"},
-  m_Buffer{capsule::STLVector{accessMode, m_RankMPI, m_DebugMod}},
-  m_BP1Aggregator{format::BP1Aggregator(m_MPIComm, debugMode)},
-  m_MaxBufferSize{m_Buffer.m_Data.max_size()}
+         " BPFileWriter constructor (or call to ADIOS Open).\n"),
+  m_Buffer(accessMode, m_RankMPI, m_DebugMode),
+  m_BP1Aggregator(m_MPIComm, debugMode),
+  m_MaxBufferSize(m_Buffer.m_Data.max_size())
 {
   m_MetadataSet.TimeStep = 1; // starting at one to be compatible with ADIOS1.x
   Init();