Cleaned up Shuffler.js