diff --git a/dnsconfig.js b/dnsconfig.js
index e36854e..81a9a99 100644
--- a/dnsconfig.js
+++ b/dnsconfig.js
@@ -4,58 +4,57 @@
 var DSP_OVH = NewDnsProvider("ovh");
 var REG_OVH = NewRegistrar("ovh");
 
-D("mmbradley.ca", REG_OVH,
+var DOMAIN_NAME = "mmbradley.ca";
+var TIME_TO_LIVE = 3600;
+var IPv4 = IP("51.79.71.238");
+var IPv6 = "2607:5300:205:200::4bcf";
+
+function service(subdomain) {
+	return [A(subdomain, IPv4), AAAA(subdomain, IPv6)];
+}
+
+function minecraftServer(name, port) {
+	name = name + ".mc";
+	return [service(name), SRV("_minecraft._tcp." + name, 0, 5, port, name + "." + DOMAIN_NAME + ".")]
+}
+
+D(DOMAIN_NAME, REG_OVH,
 	DnsProvider(DSP_OVH),
-	DefaultTTL(3600),
-	NAMESERVER_TTL(3600),
+	DefaultTTL(TIME_TO_LIVE),
+
+	NAMESERVER_TTL(TIME_TO_LIVE),
 	// NAMESERVER("dns200.anycast.me."),
 	// NAMESERVER("ns200.anycast.me."),
-	A("@", "51.79.71.238"),
-	A("www", "51.79.71.238"),
-	A("mc", "51.79.71.238"),
-	AAAA("@", "2607:5300:205:200::4bcf"),
-	AAAA("www", "2607:5300:205:200::4bcf"),
-	AAAA("mc", "2607:5300:205:200::4bcf"),
-	A("git", "51.79.71.238"),
-	AAAA("git", "2607:5300:205:200::4bcf"),
-	A("keycloak", "51.79.71.238"),
-	AAAA("keycloak", "2607:5300:205:200::4bcf"),
-	A("mail", "51.79.71.238"),
-	AAAA("mail", "2607:5300:205:200::4bcf"),
+
+	service("@"),
+	service("www"),
+
+	service("ldap"),
+	service("keycloak"),
+	service("headscale"),
+
+	service("mail"),
 	MX("@", 10, "mail.mmbradley.ca."),
-	A("ldap", "51.79.71.238"),
-	AAAA("ldap", "2607:5300:205:200::4bcf"),
 	TXT("mail._domainkey", "v=DKIM1; h=sha256; k=rsa; p=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoJKbz8ihTjVtVjxclGFWny7O3Cl0F0gUZ6RRUSn1Ig6xirX4qHvXHO2KoxoH/S/qwxJf4wrVfwbiwyOFz37RtEFR4eT1sYUyYixveFzin9UfME/jSQRtC0N/cSPQ5nOfkngCC2XrfwuZlmuE3IUdQw4CIyIEuwYgdFMjOljsgWX5g9xh92waJusVRyQYtRIDwv9NFwjeuFJFH6CWmzFIu3I1Krk07QoEN7ENZJhioyLI7n4KKsp2mYrNay581/OzC5HiIQUfyjeHPEYETHyK2Lda2zJ7/od0ZP3jffwVfg3XItQ8cvg8tGncEnzc1Fg+iFJw14AFzlg3sprmwfqefQIDAQAB"),
 	TXT("_dmarc", "v=DMARC1; p=reject; sp=reject; fo=0; adkim=r; aspf=r; pct=100; rf=afrf; ri=86400; rua=mailto:admin@mmbradley.ca; ruf=mailto:admin@mmbradley.ca"),
 	TXT("@", "v=spf1 mx -all"),
-	A("headscale", "51.79.71.238"),
-	AAAA("headscale", "2607:5300:205:200::4bcf"),
-	A("jellyfin", "51.79.71.238"),
-	AAAA("jellyfin", "2607:5300:205:200::4bcf"),
-	A("jsut.mc", "51.79.71.238"),
-	AAAA("jsut.mc", "2607:5300:205:200::4bcf"),
-	SRV("_minecraft._tcp.jsut.mc", 0, 5, 25567, "jsut.mc.mmbradley.ca."),
-	A("david.mc", "51.79.71.238"),
-	AAAA("david.mc", "2607:5300:205:200::4bcf"),
-	SRV("_minecraft._tcp.david.mc", 0, 5, 25566, "david.mc.mmbradley.ca."),
-	A("dash", "51.79.71.238"),
-	AAAA("dash", "2607:5300:205:200::4bcf"),
-	A("hs.mc", "51.79.71.238"),
-	AAAA("hs.mc", "2607:5300:205:200::4bcf"),
-	SRV("_minecraft._tcp.hs.mc", 0, 5, 25564, "hs.mc.mmbradley.ca."),
-	A("glances", "51.79.71.238"),
-	AAAA("glances", "2607:5300:205:200::4bcf"),
-	A("dozzle", "51.79.71.238"),
-	AAAA("dozzle", "2607:5300:205:200::4bcf"),
-	A("nginx", "51.79.71.238"),
-	AAAA("nginx", "2607:5300:205:200::4bcf"),
-	A("pi5.glances", "51.79.71.238"),
-	AAAA("pi5.glances", "2607:5300:205:200::4bcf"),
-	A("vps-146c0164.glances", "51.79.71.238"),
-	AAAA("vps-146c0164.glances", "2607:5300:205:200::4bcf"),
-	A("hpomen.glances", "51.79.71.238"),
-	AAAA("hpomen.glances", "2607:5300:205:200::4bcf"),
-	A("ntfy", "51.79.71.238"),
-	AAAA("ntfy", "2607:5300:205:200::4bcf"),
+
+	service("dash"),
+	service("nginx"),
+	service("dozzle"),
+
+	service("git"),
+	service("jellyfin"),
+	service("ntfy"),
+
+	service("glances"),
+	service("pi5.glances"),
+	service("vps-146c0164.glances"),
+	service("hpomen.glances"),
+
+	service("mc"),
+	minecraftServer("jsut", 25567),
+	minecraftServer("david", 25566),
+	minecraftServer("hs", 25564),
 );