[util] Minor, cosmetic changes