cleanup; limited the scope of the parameterization