changes shuffle method
cleans up shuffle method
same function as before