removal of an unnecessary recursion, addition of forgotten move, removal of
unnecessary const qualifier, change int to -> size_t