Made template name specific + tidy params