simplify shuffle, improved style