cleanup to comments