slight cleanup to previous pull request