clean up and reshuffling