Minor cleanup to service files