Optimize shuffle and fix comment