Minor cleanup to code