shuffle, refactoring gone wrong