Cleaned up template (again)