Minor cleanup of Utils classes