further cleanup to private