Use std::shuffle instead of std::random_shuffle

… because rand(), which is default in random_shuffle, is considered
harmful.
Code cleanup