Solving issue #2: templates calm & Elegant