cleaning, better sorting