update shuffle consolidation code per review comments