minor template cleanup