util: Address review comments