diff --git a/src/main.tal b/src/main.tal
index f902a65..a9a47c4 100644
--- a/src/main.tal
+++ b/src/main.tal
@@ -1175,21 +1175,15 @@ RTN
 
 @draw-short ( short* color -- )
 
-	STH 
-	SWP STHkr ,draw-byte JSR 
-	STHr 
+	STH SWP STHkr ,draw-byte JSR STHr 
 
 @draw-byte ( byte color -- )
 
-	STH 
-	DUP #04 SFT STHkr ,draw-hex JSR #0f AND 
-	STHr 
+	STH DUP #04 SFT STHkr ,draw-hex JSR #0f AND STHr 
 
 @draw-hex ( char color -- )
 
-	SWP 
-	,hexchar JSR 
-	SWP
+	SWP #0f AND [ DUP #09 > #27 * + #30 + ] SWP
 
 @draw-char ( char color -- )
 
@@ -1199,14 +1193,6 @@ RTN
 
 RTN
 
-@hexchar ( char -- hexchar )
-
-	DUP #09 > ,&above JCN 
-		#30 + RTN 
-	&above #57 +
-
-RTN
-
 ( file )
 
 @new-file ( -- )
@@ -1470,15 +1456,11 @@ RTN
 
 RTN
 
-@print-hex ( value* -- )
+@print ( short* -- )
 
-	SWP ,&byte JSR
-	&byte ( byte -- )
-		STHk #04 SFT ,&parse JSR #18 DEO
-		STHr #0f AND ,&parse JSR #18 DEO
-	RTN
-	&parse ( byte -- char ) DUP #09 GTH ,&above JCN #30 + RTN
-	&above #57 + RTN
+	&short ( short* -- ) SWP ,&byte JSR
+	&byte ( byte -- ) DUP #04 SFT ,&char JSR
+	&char ( char -- ) #0f AND DUP #09 GTH #27 MUL ADD #30 ADD EMIT
 
 RTN
 
diff --git a/src/utils.tal b/src/utils.tal
index 4de61c7..3111f59 100644
--- a/src/utils.tal
+++ b/src/utils.tal
@@ -21,9 +21,8 @@
 %10MOD { #0f AND } %10MOD2 { #000f AND2 }
 
 %EMIT   { #18 DEO }
-%PRINT  { ;print-str JSR2 #0a EMIT }
-%DEBUG  { ;print-hex/byte JSR2 #0a EMIT }
-%DEBUG2 { ;print-hex JSR2 #0a EMIT }
+%DEBUG  { ;print/byte JSR2 #0a EMIT }
+%DEBUG2 { ;print/short JSR2 #0a EMIT }
 
 %IS-VALID { DUP #1f > SWP #7f < AND }
 %IS-UC { DUP #40 > SWP #5b < AND }