COde Cleanup With SubTemplates.