Cleaned up some templates.