Simplification exploiting C++ vector structure and correction of bug to make the code compatible with a wider range of Armadillo versions