slight cleanup to reduce errors.