some cosmetic changes for util component