Replaced some C arrays by C++11 arrays