more cleanup to make adding tests easier