Remove use of std::array and initialization of non-static members