Small cleanup to utils