Cleaned up templates.