Refactored templates