refactor(utils): minor refactor and code normalization