Clean up and shuffle