Minor cleanup of template copy