Minor refactoring
Use std::size_t instead of plain size_t