Moved shuffle into separate function