[util] Tons of cosmetic changes