Minor cleanup to main