Minor refactors in Utils class