minor cleanup
more stringent max consecutive during shuffle