Optimize shuffle and fix comment
shuffle: Avoid swapping current index
Merge pull request #1712 from megawac/shuffle

Optimize shuffle and fix comment