diff --git a/data/aut-num/AS4242422376 b/data/aut-num/AS4242422376
index 46dd9d05a..01f722aeb 100644
--- a/data/aut-num/AS4242422376
+++ b/data/aut-num/AS4242422376
@@ -1,7 +1,7 @@
-aut-num:            AS4242422376
-descr:              Primary
-admin-c:            THEOM-DN42
-tech-c:             THEOM-DN42
-mnt-by:             MONARCH-MNT
-as-name:            MONARCH-AS
-source:             DN42
+aut-num:            AS4242422376
+descr:              Primary
+admin-c:            THEOM-DN42
+tech-c:             THEOM-DN42
+mnt-by:             MONARCH-MNT
+as-name:            MONARCH-AS
+source:             DN42
diff --git a/data/aut-num/AS4242422377 b/data/aut-num/AS4242422377
index 5695bc575..415664d80 100644
--- a/data/aut-num/AS4242422377
+++ b/data/aut-num/AS4242422377
@@ -1,7 +1,7 @@
-aut-num:            AS4242422377
-descr:              Primary
-admin-c:            THEOM-DN42
-tech-c:             THEOM-DN42
-mnt-by:             MONARCH-MNT
-as-name:            MONARCH-PEER-AS
-source:             DN42
+aut-num:            AS4242422377
+descr:              Primary
+admin-c:            THEOM-DN42
+tech-c:             THEOM-DN42
+mnt-by:             MONARCH-MNT
+as-name:            MONARCH-PEER-AS
+source:             DN42
diff --git a/data/inetnum/172.23.203.0_26 b/data/inetnum/172.23.203.0_26
index c5f300468..42f857113 100644
--- a/data/inetnum/172.23.203.0_26
+++ b/data/inetnum/172.23.203.0_26
@@ -1,8 +1,8 @@
-inetnum:            172.23.203.0 - 172.23.203.63
-cidr:               172.23.203.0/26
-netname:            MONARCH-NETWORK-01
-admin-c:            THEOM-DN42
-tech-c:             THEOM-DN42
-mnt-by:             MONARCH-MNT
-status:             ASSIGNED
-source:             DN42
+inetnum:            172.23.203.0 - 172.23.203.63
+cidr:               172.23.203.0/26
+netname:            MONARCH-NETWORK-01
+admin-c:            THEOM-DN42
+tech-c:             THEOM-DN42
+mnt-by:             MONARCH-MNT
+status:             ASSIGNED
+source:             DN42
diff --git a/data/inetnum/172.23.203.64_26 b/data/inetnum/172.23.203.64_26
index 37aff6406..dfe454580 100644
--- a/data/inetnum/172.23.203.64_26
+++ b/data/inetnum/172.23.203.64_26
@@ -1,8 +1,8 @@
-inetnum:            172.23.203.64 - 172.23.203.127
-cidr:               172.23.203.64/26
-netname:            MONARCH-NETWORK-02
-admin-c:            THEOM-DN42
-tech-c:             THEOM-DN42
-mnt-by:             MONARCH-MNT
-status:             ASSIGNED
-source:             DN42
+inetnum:            172.23.203.64 - 172.23.203.127
+cidr:               172.23.203.64/26
+netname:            MONARCH-NETWORK-02
+admin-c:            THEOM-DN42
+tech-c:             THEOM-DN42
+mnt-by:             MONARCH-MNT
+status:             ASSIGNED
+source:             DN42
diff --git a/data/mntner/MONARCH-MNT b/data/mntner/MONARCH-MNT
index 098da95a6..2605b8ead 100644
--- a/data/mntner/MONARCH-MNT
+++ b/data/mntner/MONARCH-MNT
@@ -1,7 +1,7 @@
-mntner:             MONARCH-MNT
-admin-c:            THEOM-DN42
-tech-c:             THEOM-DN42
-mnt-by:             MONARCH-MNT
-auth:               pgp-fingerprint 2AEAB288F37BA3BD1918256D23FF2A5117DC7743
-auth:               ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDJUxUKBiIYB2rG13JBeIpWVGRwaO4SdKN92frjsB0NoVwxqApbBg+W3jqpv2wu2ZodICeRPy+xJuU/G4YMKwD/d6wzZJsQlO8Ocm2M0PBbTi02ei55ur1VTcmFbxkouRFkvwyqJQ80SD0Ovv//rgWxI4y4sU0834RPI2SVpttJ5d9+JLzD86lsxy6WKn10kDJ6kocfq9WWPKMnNx7D8pQG27gpmpw+ClTAssXIt+N24IrS5yXtC3Zw2zCoteOLnECdrUZzLGIJ0NJshRsYvLQzkSyD4VEjJdrx43gS4gLt7mxQJ8yHmyEcU5C7WJhtrJAFS+SnOzfegQWVzGwiJYXB td512@td512.io
-source:             DN42
+mntner:             MONARCH-MNT
+admin-c:            THEOM-DN42
+tech-c:             THEOM-DN42
+mnt-by:             MONARCH-MNT
+auth:               pgp-fingerprint 2AEAB288F37BA3BD1918256D23FF2A5117DC7743
+auth:               ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDJUxUKBiIYB2rG13JBeIpWVGRwaO4SdKN92frjsB0NoVwxqApbBg+W3jqpv2wu2ZodICeRPy+xJuU/G4YMKwD/d6wzZJsQlO8Ocm2M0PBbTi02ei55ur1VTcmFbxkouRFkvwyqJQ80SD0Ovv//rgWxI4y4sU0834RPI2SVpttJ5d9+JLzD86lsxy6WKn10kDJ6kocfq9WWPKMnNx7D8pQG27gpmpw+ClTAssXIt+N24IrS5yXtC3Zw2zCoteOLnECdrUZzLGIJ0NJshRsYvLQzkSyD4VEjJdrx43gS4gLt7mxQJ8yHmyEcU5C7WJhtrJAFS+SnOzfegQWVzGwiJYXB td512@td512.io
+source:             DN42
diff --git a/data/organisation/ORG-MONARCH b/data/organisation/ORG-MONARCH
index 5062f8517..b8a30e3e8 100644
--- a/data/organisation/ORG-MONARCH
+++ b/data/organisation/ORG-MONARCH
@@ -1,6 +1,6 @@
-organisation:       ORG-MONARCH
-org-name:           Monarch Solutions, Inc.
-admin-c:            THEOM-DN42
-tech-c:             THEOM-DN42
-mnt-by:             MONARCH-MNT
-source:             DN42
+organisation:       ORG-MONARCH
+org-name:           Monarch Solutions, Inc.
+admin-c:            THEOM-DN42
+tech-c:             THEOM-DN42
+mnt-by:             MONARCH-MNT
+source:             DN42
diff --git a/data/person/THEOM-DN42 b/data/person/THEOM-DN42
index 6d6feb345..ef5919de2 100644
--- a/data/person/THEOM-DN42
+++ b/data/person/THEOM-DN42
@@ -1,6 +1,6 @@
-person:             Theo
-contact:            irc:TheoM@freenode
-e-mail:             theo@theom.nz
-nic-hdl:            THEOM-DN42
-mnt-by:             MONARCH-MNT
-source:             DN42
+person:             Theo
+contact:            irc:TheoM@freenode
+e-mail:             theo@theom.nz
+nic-hdl:            THEOM-DN42
+mnt-by:             MONARCH-MNT
+source:             DN42
diff --git a/data/route/172.23.203.0_26 b/data/route/172.23.203.0_26
index 032919cac..15e865222 100644
--- a/data/route/172.23.203.0_26
+++ b/data/route/172.23.203.0_26
@@ -1,4 +1,4 @@
-route:              172.23.203.0/26
-origin:             AS4242422376
-mnt-by:             MONARCH-MNT
-source:             DN42
+route:              172.23.203.0/26
+origin:             AS4242422376
+mnt-by:             MONARCH-MNT
+source:             DN42
diff --git a/data/route/172.23.203.64_26 b/data/route/172.23.203.64_26
index fe3d11cd1..b8932c2ec 100644
--- a/data/route/172.23.203.64_26
+++ b/data/route/172.23.203.64_26
@@ -1,4 +1,4 @@
-route:              172.23.203.64/26
-origin:             AS4242422377
-mnt-by:             MONARCH-MNT
-source:             DN42
+route:              172.23.203.64/26
+origin:             AS4242422377
+mnt-by:             MONARCH-MNT
+source:             DN42