cleaning & reorg