diff --git a/lib/squib/args/arg_loader.rb b/lib/squib/args/arg_loader.rb
index 56e066a..255ad00 100644
--- a/lib/squib/args/arg_loader.rb
+++ b/lib/squib/args/arg_loader.rb
@@ -111,27 +111,15 @@ module Squib
           p_str = "@#{p}"
           p_val = instance_variable_get(p_str)
           if p_val.respond_to? :each
-            arr = p_val.map { |x| convert_unit(x, dpi) }
+            arr = p_val.map { |x| UnitConversion.parse(x, dpi) }
             instance_variable_set p_str, arr
           else
-            instance_variable_set p_str, convert_unit(p_val, dpi)
+            instance_variable_set p_str, UnitConversion.parse(p_val, dpi)
           end
         end
         self
       end
 
-      def convert_unit(arg, dpi)
-        case arg.to_s.rstrip
-        when /in$/ # ends with "in"
-          arg.rstrip[0..-2].to_f * dpi
-        when /cm$/ # ends with "cm"
-          arg.rstrip[0..-2].to_f * dpi * INCHES_IN_CM
-        else
-          arg
-        end
-      end
-      module_function :convert_unit
-
     end
 
   end
diff --git a/lib/squib/args/draw.rb b/lib/squib/args/draw.rb
index 3e9ae60..9593a20 100644
--- a/lib/squib/args/draw.rb
+++ b/lib/squib/args/draw.rb
@@ -59,7 +59,7 @@ module Squib
 
       def validate_dash(arg, _i)
         arg.to_s.split.collect do |x|
-          convert_unit(x, @dpi).to_f
+          UnitConversion.parse(x, @dpi).to_f
         end
       end