--- a/utils/themwi-dump-numdb2.c	Mon Aug 14 11:45:41 2023 -0800
+++ b/utils/themwi-dump-numdb2.c	Mon Aug 14 12:17:19 2023 -0800
@@ -25,9 +25,9 @@
 				binfile_pathname);
 			exit(1);
 		}
-		printf("Owned NANP number: %03u-%03u-%04u\n",
-			rec.number[0], rec.number[1], rec.number[2]);
-		printf("  Number flags 0x%02X, usage byte 0x%02X\n",
+		printf(
+	"Owned NANP number %03u-%03u-%04u: flags 0x%02X, usage 0x%02X\n",
+			rec.number[0], rec.number[1], rec.number[2],
 			rec.number_flags, rec.usage);
 		if ((rec.usage & NUMBER_USAGE_MASK) == NUMBER_USAGE_TYPE_ALIAS)
 			printf("  Alias maps to: %03u-%03u-%04u\n",
@@ -53,11 +53,10 @@
 		printf("Short number %04u is of type 0x%02X\n", rec.short_num,
 			rec.short_num_type);
 		if (rec.short_num_type == SHORT_NUM_TYPE_ABBREV) {
-			printf("  Abbrev maps to: %03u-%03u-%04u\n",
+			printf(
+		"  Abbrev maps to: %03u-%03u-%04u, full number flags 0x%02X\n",
 				rec.fullnum_prefix[0], rec.fullnum_prefix[1],
-				rec.short_num);
-			printf("  Full number flags: 0x%02X\n",
-				rec.fullnum_flags);
+				rec.short_num, rec.fullnum_flags);
 		}
 	}
 }