Replaced HTML comments with Django/Jinja comments
Lazy-evaluation optimization