Refactor and shuffle