Refactor for shuffle logic. rename variables