- Changed raw arrays to std::array