More and more cleanup/sorting !