namespace cleaning & reordering