WHAT: Minor cleanup to util classes