bit of cleanup to make testing easier