Refactoring shuffler