more cleanup/sorting