Re-shuffling and tidying