Minor cleanup to various files