Minor cleanup to improve readability.