Refactoring

Fix shuffle()