Minor cleanup to previous commit