Minor template cleanup