Making templates simpler