improve unit conversions

1 files changed, 6 insertions, 4 deletions

diff --git a/volume/volume.go b/volume/volume.go
index 020d1a6..acec040 100644
--- a/volume/volume.go
+++ b/volume/volume.go
@@ -44,11 +44,13 @@ func UnitFromString(s string) (unit, error) {
 }
 
 type Volume struct {
-	Val  float32
-	Unit unit
+	val float32
+}
+
+func New(i float32, u unit) Volume {
+	return Volume{i * float32(u)}
 }
 
 func (v Volume) AsUnit(u unit) float32 {
-	cc := v.Val * float32(v.Unit) // Convert to cubic centimetres.
-	return cc / float32(u)        // Convert to desired unit.
+	return v.val / float32(u)
 }