Refactored the template rendering